diff --git a/client/src/components/instruments/FilterBar.vue b/client/src/components/instruments/FilterBar.vue
index 20bc495c..365f6730 100644
--- a/client/src/components/instruments/FilterBar.vue
+++ b/client/src/components/instruments/FilterBar.vue
@@ -11,19 +11,15 @@
       <SearchMagnifyingGlass class="filter-bar__search-icon"></SearchMagnifyingGlass>
       <!-- Font Awesome search icon as an example -->
     </div>
-    <pill-radio-buttons
-      :selectableItems="languageOptions"
-      :defaultSelectedItem="initialLanguage"
-      class="filter-bar__language-selection"
-      @update:selectedItem="(item) => (selectedLanguage = item)"
-    />
+    <language-switcher class="filter-bar__language-selection"/>
+
   </div>
 </template>
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import PillRadioButtons from '@/components/ui/PillRadioButtons.vue';
 import SearchMagnifyingGlass from '@/components/icons/SearchMagnifyingGlass.vue';
+import LanguageSwitcher from "@/components/LanguageSwitcher.vue";
 
 const searchQuery = ref('');
 const emit = defineEmits(['update:filter']);
@@ -31,14 +27,6 @@ const emit = defineEmits(['update:filter']);
 const updateSearch = () => {
   emit('update:filter', searchQuery.value);
 };
-
-const languageOptions: Array<{ id: number; label: string }> = ref([
-  { id: 1, label: 'De' },
-  { id: 2, label: 'Fr' },
-  { id: 3, label: 'En' },
-]);
-
-const initialLanguage = languageOptions.value[0];
 </script>
 
 <style scoped lang="scss">
diff --git a/client/src/components/instruments/FilterGroup.vue b/client/src/components/instruments/FilterGroup.vue
index 1383c13b..b32a9a83 100644
--- a/client/src/components/instruments/FilterGroup.vue
+++ b/client/src/components/instruments/FilterGroup.vue
@@ -9,7 +9,7 @@
       :id="category.id"
       @filter="setCategoryFilter(category.id)"
     />
-    <div class="filter-group__children">
+    <div class="filter-group__children" v-if="$flavor.showInstrumentSubCategories">
       <filter-entry
         :data-cy="`filter-${type.type}`"
         :category="type.category"
diff --git a/client/src/helpers/app-flavor.constants.ts b/client/src/helpers/app-flavor.constants.ts
index cba19f48..e4683663 100644
--- a/client/src/helpers/app-flavor.constants.ts
+++ b/client/src/helpers/app-flavor.constants.ts
@@ -20,6 +20,7 @@ export const defaultFlavorValues: FlavorValues = {
   showFooter: true,
   showObjectivesTitle: true,
   showInstrumentFilterSidebar: true,
+  showInstrumentSubCategories: true,
   showPortfolio: true,
   showEHB: true,
   helloIllustration: 'HelloIllustration',
@@ -46,6 +47,7 @@ export const myKvValues: FlavorValues = {
   showObjectivesTitle: false,
   showInstrumentFilterSidebar: true,
   showPortfolio: true,
+  showInstrumentSubCategories: false,
   showEHB: false,
   helloIllustration: 'HelloMyKVIllustration',
 };
@@ -57,6 +59,7 @@ export const dhaValues: FlavorValues = Object.assign({}, myKvValues, {
   appLogo: 'https://skillbox-my-detailhandel-dha-prod.s3.eu-central-1.amazonaws.com/myDHA-logo.png',
   textAppName: 'myDHA',
   helloIllustration: 'HelloMyDHAIllustration',
+  showInstrumentSubCategories: false,
 });
 
 export const dhfValues: FlavorValues = Object.assign({}, myKvValues, {
@@ -66,4 +69,5 @@ export const dhfValues: FlavorValues = Object.assign({}, myKvValues, {
   appLogo: 'https://skillbox-my-detailhandel-dhf-prod.s3.eu-central-1.amazonaws.com/myDHF-logo.png',
   textAppName: 'myDHF',
   helloIllustration: 'HelloMyDHFIllustration',
+  showInstrumentSubCategories: false,
 });
diff --git a/client/src/helpers/types.ts b/client/src/helpers/types.ts
index 17397098..3525a790 100644
--- a/client/src/helpers/types.ts
+++ b/client/src/helpers/types.ts
@@ -14,6 +14,7 @@ export interface FlavorValues {
   showFooter: boolean;
   showObjectivesTitle: boolean;
   showInstrumentFilterSidebar: boolean;
+  showInstrumentSubCategories: boolean;
   showPortfolio: boolean;
   showEHB: boolean;
   helloIllustration: string;