diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 413a606..fd57998 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -159,8 +159,8 @@
 services:
   authNAuth:
     name: authNAuthService
-    technical-username: admin_technical_portal
-    technical-userpassword: admin_technical_portal
+    technical-username: ${GFI_AUTHNAUTH_USERNAME}
+    technical-userpassword: ${GFI_AUTHNAUTH_PASSWORD}
   contacts:
     name: contactService
     communicationType:
@@ -414,8 +414,8 @@
 services:
   authNAuth:
     name: authNAuthService
-    technical-username: admin_technical_portal
-    technical-userpassword: admin_technical_portal
+    technical-username: ${GFI_AUTHNAUTH_USERNAME}
+    technical-userpassword: ${GFI_AUTHNAUTH_PASSWORD}
   contacts:
     name: contactService
     communicationType:
diff --git a/scripts/setUserPassAsEnvVariablesLinux.sh b/scripts/setUserPassAsEnvVariablesLinux.sh
index e91a6f6..dc88932 100644
--- a/scripts/setUserPassAsEnvVariablesLinux.sh
+++ b/scripts/setUserPassAsEnvVariablesLinux.sh
@@ -11,4 +11,8 @@
 
 # STOERUNGSAUSKUNFT
 export GFI_STOERUNGSAUSKUNFT_USERNAME=mock_user
-export GFI_STOERUNGSAUSKUNFT_PASSWORD=mock_password
\ No newline at end of file
+export GFI_STOERUNGSAUSKUNFT_PASSWORD=mock_password
+
+# AUTH&AUTH CLIENT
+export GFI_AUTHNAUTH_USERNAME=mock_user
+export GFI_AUTHNAUTH_PASSWORD=mock_password
\ No newline at end of file
diff --git a/scripts/setUserPassAsEnvVariablesWindows.bat b/scripts/setUserPassAsEnvVariablesWindows.bat
index 0726240..e6e7bde 100644
--- a/scripts/setUserPassAsEnvVariablesWindows.bat
+++ b/scripts/setUserPassAsEnvVariablesWindows.bat
@@ -10,4 +10,8 @@
 
 REM STOERUNGSAUSKUNFT
 setx GFI_STOERUNGSAUSKUNFT_USERNAME "mock_user" /M
-setx GFI_STOERUNGSAUSKUNFT_PASSWORD "mock_password" /M
\ No newline at end of file
+setx GFI_STOERUNGSAUSKUNFT_PASSWORD "mock_password" /M
+
+REM AUTH&AUTH CLIENT
+setx GFI_AUTHNAUTH_USERNAME "mock_user" /M 
+setx GFI_AUTHNAUTH_PASSWORD "mock_password" /M