diff --git a/dbrepo-auth-service/init/app.py b/dbrepo-auth-service/init/app.py
index d3a26a42fe56d46ceece4199a95b434e109d6ff3..7d43f163fa3f50e326ba71933674500121d9fef2 100644
--- a/dbrepo-auth-service/init/app.py
+++ b/dbrepo-auth-service/init/app.py
@@ -12,7 +12,7 @@ user_id = admin.get_user_id(username=system_username)
 print(f'Successfully fetched user id: {user_id}')
 
 try:
-    conn = mariadb.connect(user="root",
+    conn = mariadb.connect(user=os.getenv('METADATA_USERNAME', 'root'),
                            password=os.getenv('METADATA_DB_PASSWORD', 'dbrepo'),
                            host="metadata-db",
                            port=3306,
diff --git a/docker-compose.yml b/docker-compose.yml
index abf0e0ec18925630f88fd77b913bc064b5abff4e..ca7c642c4dc6fa710000921ff0d5260bcd34f5ac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -119,6 +119,9 @@ services:
       AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
       AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
       AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
+      METADATA_DB: "${METADATA_DB:-dbrepo}"
+      METADATA_DB_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
+      METADATA_USERNAME: "root"
       SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
     depends_on:
       dbrepo-auth-service:
diff --git a/helm/dbrepo/templates/auth-secret.yaml b/helm/dbrepo/templates/auth-secret.yaml
index 4010e66a8dcc27564d534078e1eea2b754bd34a1..a568ef25007e51d70bf4ad1ac186645e57499015 100644
--- a/helm/dbrepo/templates/auth-secret.yaml
+++ b/helm/dbrepo/templates/auth-secret.yaml
@@ -9,5 +9,8 @@ stringData:
   AUTH_SERVICE_ADMIN: "{{ .Values.authservice.auth.adminUser }}"
   AUTH_SERVICE_ADMIN_PASSWORD: "{{ .Values.authservice.auth.adminPassword }}"
   AUTH_SERVICE_ENDPOINT: "{{ .Values.authservice.endpoint }}"
+  METADATA_DB: "{{ .Values.metadatadb.db.name }}"
+  METADATA_DB_PASSWORD: "{{ .Values.metadatadb.rootUser.password }}"
+  METADATA_USERNAME: "{{ .Values.metadatadb.rootUser.user }}"
   SYSTEM_USERNAME: "{{ .Values.identityservice.users }}"
 {{- end }}
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index ab3c8e9d509f4d65a9690f757e20a0b90b0e457d..cd52f413e1421b77e56a4004352760058bf1e4d6 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -112,7 +112,7 @@ authservice:
   init:
     image:
       ## @skip authservice.init.image.name
-      name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.0
+      name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.0rc1
     ## @param authservice.init.resourcesPreset The container resource preset
     resourcesPreset: "nano"
     ## @param authservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)