diff --git a/charts/bpdm/templates/secret.yaml b/charts/bpdm/templates/tests/secret.yaml
similarity index 100%
rename from charts/bpdm/templates/secret.yaml
rename to charts/bpdm/templates/tests/secret.yaml
diff --git a/charts/bpdm/templates/tests/test-connection.yaml b/charts/bpdm/templates/tests/test-connection.yaml
index c1c747e1d..606c08d54 100644
--- a/charts/bpdm/templates/tests/test-connection.yaml
+++ b/charts/bpdm/templates/tests/test-connection.yaml
@@ -27,7 +27,7 @@ metadata:
 spec:
   containers:
     - name: java-test
-      image: "{{ .Values.tests.registry }}/{{ .Values.tests.repository }}:{{ .Values.tests.tag | default .Chart.AppVersion }}"
+      image: "{{ .Values.tests.image.registry }}/{{ .Values.tests.image.repository }}:{{ .Values.tests.image.tag | default .Chart.AppVersion }}"
       env:
         - name: SPRING_CONFIG_IMPORT
           value: "/etc/conf/secrets.yml"
diff --git a/charts/bpdm/values.yaml b/charts/bpdm/values.yaml
index d7007b66e..9a305ebe4 100644
--- a/charts/bpdm/values.yaml
+++ b/charts/bpdm/values.yaml
@@ -83,7 +83,6 @@ centralidp:
     fullnameOverride: bpdm-centralidp
 
 tests:
-  enabled: true
   applicationConfig:
     bpdm:
       client:
@@ -98,4 +97,4 @@ tests:
     repository: tractusx/bpdm-system-tester
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: ""
\ No newline at end of file
+    tag: ""
diff --git a/docker/compose/dependencies/docker-compose.yml b/docker/compose/dependencies/docker-compose.yml
index 73b6875e6..b854470d7 100644
--- a/docker/compose/dependencies/docker-compose.yml
+++ b/docker/compose/dependencies/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       - KC_DB_URL=jdbc:postgresql://bpdm-postgres:5432/keycloak
       - KC_DB_USERNAME=keycloak
       - KEYCLOAK_ADMIN=admin
-      - KEYCLOAK_ADMIN_PASSWORD=admin
+      - KEYCLOAK_ADMIN_PASSWORD=${KEYCLOAK_ADMIN_PASSWORD}
     command: start-dev --import-realm
     ports:
         - "8180:8080"