diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index 9e6e911eb..ed6cbb0b4 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -26,7 +26,7 @@ EMAIL_CODE_REQUEST_TIME=10
 # config versions
 DATABASE_CONFIG_VERSION=v1.2022-03-18
 BACKEND_CONFIG_VERSION=v21.2024-01-06
-FRONTEND_CONFIG_VERSION=v5.2024-01-08
+FRONTEND_CONFIG_VERSION=v6.2024-02-27
 ADMIN_CONFIG_VERSION=v2.2024-01-04
 FEDERATION_CONFIG_VERSION=v2.2023-08-24
 FEDERATION_DHT_CONFIG_VERSION=v4.2024-01-17
diff --git a/frontend/.env.dist b/frontend/.env.dist
index f7e7edcd6..ec8d088c8 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -21,3 +21,5 @@ META_DESCRIPTION_EN="Gratitude is the currency of the new age. More and more peo
 META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem"
 META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System"
 META_AUTHOR="Bernd Hückstädt - Gradido-Akademie"
+
+GMS=false
diff --git a/frontend/.env.template b/frontend/.env.template
index c365ab8cf..cc131aa62 100644
--- a/frontend/.env.template
+++ b/frontend/.env.template
@@ -24,3 +24,5 @@ META_DESCRIPTION_EN=$META_DESCRIPTION_EN
 META_KEYWORDS_DE=$META_KEYWORDS_DE
 META_KEYWORDS_EN=$META_KEYWORDS_EN
 META_AUTHOR=$META_AUTHOR
+
+GMS=$GMS
\ No newline at end of file
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index dd2e85dac..a453fd18e 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -8,7 +8,7 @@ const constants = {
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v5.2024-01-08',
+    EXPECTED: 'v6.2024-02-27',
     CURRENT: '',
   },
 }
@@ -20,6 +20,10 @@ const version = {
   BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT ?? '0000000').slice(0, 7),
 }
 
+const features = {
+  GMS: process.env.GMS ?? false,
+}
+
 const environment = {
   NODE_ENV: process.env.NODE_ENV,
   DEBUG: process.env.NODE_ENV !== 'production' ?? false,
@@ -81,6 +85,7 @@ if (
 const CONFIG = {
   ...constants,
   ...version,
+  ...features,
   ...environment,
   ...endpoints,
   ...community,
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index cb840e068..77a6ef947 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -79,47 +79,49 @@
           </b-col>
         </b-row>
       </b-tab>
-      <b-tab :title="$t('ExternServices')">
-        <div class="h2">{{ $t('ExternServices') }}</div>
-        <div class="h3">{{ $t('GMS') }}</div>
-        <b-row class="mb-3">
-          <b-col cols="12" md="6" lg="6">
-            {{ $t('settings.GMS.switch') }}
-            <div class="text-small">
-              {{ gmsAllowed ? $t('settings.GMS.enabled') : $t('settings.GMS.disabled') }}
-            </div>
-          </b-col>
-          <b-col cols="12" md="6" lg="6" class="text-right">
-            <user-g-m-s-switch @gmsAllowed="gmsStateSwitch" />
-          </b-col>
-        </b-row>
-        <div v-if="gmsAllowed">
-          <b-row class="mb-4">
+      <div v-if="isGMS">
+        <b-tab :title="$t('ExternServices')">
+          <div class="h2">{{ $t('ExternServices') }}</div>
+          <div class="h3">{{ $t('GMS') }}</div>
+          <b-row class="mb-3">
             <b-col cols="12" md="6" lg="6">
-              {{ $t('settings.GMS.naming-format') }}
+              {{ $t('settings.GMS.switch') }}
+              <div class="text-small">
+                {{ gmsAllowed ? $t('settings.GMS.enabled') : $t('settings.GMS.disabled') }}
+              </div>
             </b-col>
-            <b-col cols="12" md="6" lg="6">
-              <user-g-m-s-naming-format />
+            <b-col cols="12" md="6" lg="6" class="text-right">
+              <user-g-m-s-switch @gmsAllowed="gmsStateSwitch" />
             </b-col>
           </b-row>
-          <b-row class="mb-4">
-            <b-col cols="12" md="6" lg="6">
-              {{ $t('settings.GMS.location-format') }}
-            </b-col>
-            <b-col cols="12" md="6" lg="6">
-              <user-g-m-s-location-format />
-            </b-col>
-          </b-row>
-          <b-row class="mb-5">
-            <b-col cols="12" md="6" lg="6">
-              {{ $t('settings.GMS.location.label') }}
-            </b-col>
-            <b-col cols="12" md="6" lg="6">
-              <user-g-m-s-location />
-            </b-col>
-          </b-row>
-        </div>
-      </b-tab>
+          <div v-if="gmsAllowed">
+            <b-row class="mb-4">
+              <b-col cols="12" md="6" lg="6">
+                {{ $t('settings.GMS.naming-format') }}
+              </b-col>
+              <b-col cols="12" md="6" lg="6">
+                <user-g-m-s-naming-format />
+              </b-col>
+            </b-row>
+            <b-row class="mb-4">
+              <b-col cols="12" md="6" lg="6">
+                {{ $t('settings.GMS.location-format') }}
+              </b-col>
+              <b-col cols="12" md="6" lg="6">
+                <user-g-m-s-location-format />
+              </b-col>
+            </b-row>
+            <b-row class="mb-5">
+              <b-col cols="12" md="6" lg="6">
+                {{ $t('settings.GMS.location.label') }}
+              </b-col>
+              <b-col cols="12" md="6" lg="6">
+                <user-g-m-s-location />
+              </b-col>
+            </b-row>
+          </div>
+        </b-tab>
+      </div>
     </b-tabs>
 
     <!-- TODO<b-row>
@@ -140,6 +142,7 @@ import UserPassword from '@/components/UserSettings/UserPassword'
 import UserLanguage from '@/components/LanguageSwitch2.vue'
 import UserNewsletter from '@/components/UserSettings/UserNewsletter.vue'
 import { updateUserInfos } from '@/graphql/mutations'
+import CONFIG from '../config'
 
 export default {
   name: 'Profile',
@@ -180,6 +183,9 @@ export default {
       const { firstName, lastName } = this.$store.state
       return firstName === this.firstName && lastName === this.lastName
     },
+    isGMS() {
+      return CONFIG.GMS
+    },
   },
   // TODO: watch: {
   //   darkMode(val) {