diff --git a/backend/.env.dist b/backend/.env.dist
index 0164abff0..fb95e984c 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -67,5 +67,5 @@ FEDERATION_VALIDATE_COMMUNITY_TIMER=60000
 # GMS
 # GMS_ACTIVE=true
 # Coordinates of Illuminz test instance
-GMS_HOST=54.176.169.179
-GMS_PORT=3071
+#GMS_URL=http://54.176.169.179:3071
+GMS_URL=http://localhost:4044/
diff --git a/backend/.env.template b/backend/.env.template
index 290d180b3..97fd235ec 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -64,5 +64,4 @@ FEDERATION_VALIDATE_COMMUNITY_TIMER=$FEDERATION_VALIDATE_COMMUNITY_TIMER
 
 # GMS
 GMS_ACTIVE=$GMS_ACTIVE
-GMS_HOST=$GMS_HOST
-GMS_PORT=$GMS_PORT
+GMS_URL=$GMS_URL
diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index 1335e06a5..aa6c6cade 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -95,3 +95,9 @@ ADMIN_CONFIG_VERSION=v1.2022-03-18
 
 WALLET_AUTH_URL=https://stage1.gradido.net/authenticate?token={token}
 WALLET_URL=https://stage1.gradido.net/login
+
+# GMS
+#GMS_ACTIVE=true
+# Coordinates of Illuminz test instance
+#GMS_URL=http://54.176.169.179:3071
+#GMS_URL=http://localhost:4044/