diff --git a/charts/README.md b/charts/README.md
index 783f31ed89f40d12c900aeb41b2a2bc2252cfef0..1b0113e112a9bfd1800a5bf8ef2c82d6f3b1e923 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -35,6 +35,10 @@ The environment variables listed below are used to define the connection details
     - This value is generated using the `microservices.backend.url` Helm template and points to the `/auth` endpoint of the Keycloak service.
 - `KEYCLOAK_APP_REALM`: The realm to be used for the application within Keycloak.
     - Value is derived from the `global.profile` specified in the Helm values.
+- `KEYCLOAK_MASTER_USER`: The username to be used for the master realm in keycloak.
+  - Value is derived from the `keycloak.master.user` specified in the Helm values.
+- `KEYCLOAK_MASTER_PASSWORD`: The password to be used for the master realm in keycloak.
+  - Value is derived from the `keycloak.master.password` specified in the Helm values.
 
 ### Client Authority Configuration
 
@@ -71,4 +75,9 @@ redis:
   port: "6379"
   username: "default"
   password: "admin"
+
+keycloak:
+  master:
+    user: "user"
+    password: "admin"
 ```
diff --git a/charts/templates/configmap.yaml b/charts/templates/configmap.yaml
index ec3a9ef3957de7c33889a0072bb63f5a168b4f63..7a7c1cf7375d603bbbf458221ea513dcc2380843 100644
--- a/charts/templates/configmap.yaml
+++ b/charts/templates/configmap.yaml
@@ -14,5 +14,8 @@ data:
 
   KEYCLOAK_URL: "{{- include "microservices.backend.url" . }}/auth"
   KEYCLOAK_APP_REALM: "{{ .Values.global.profile }}"
+  KEYCLOAK_MASTER_USER: "{{ .Values.keycloak.master.user }}"
+  KEYCLOAK_MASTER_PASSWORD: "{{ .Values.keycloak.master.password }}"
+
   CLIENT_AUTHORITY_URL: "{{- include "tls.gateway.url" . }}"
   CLIENT_CERTIFICATE_PASSWORD: "{{ .Values.global.keystore.password }}"
\ No newline at end of file
diff --git a/charts/templates/service.yaml b/charts/templates/service.yaml
index cebc5859731d0d6f16f033caef2c26a64762489c..618911043c827b45d46d14eeab109a7a8dd5e608 100644
--- a/charts/templates/service.yaml
+++ b/charts/templates/service.yaml
@@ -5,9 +5,9 @@ metadata:
   labels:
     {{- include "microservices.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.services.type }}
+  type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.services.port }}
+    - port: {{ .Values.service.port }}
       targetPort: http
       protocol: TCP
       name: http
diff --git a/charts/values.yaml b/charts/values.yaml
index 14bb699bdeddfb83677496877465c543604fe7c1..31121ea30e6abec3c4e1be7ac096dce6db4ec559 100644
--- a/charts/values.yaml
+++ b/charts/values.yaml
@@ -118,3 +118,8 @@ redis:
   port: "6379"
   username: "default"
   password: "admin"
+
+keycloak:
+  master:
+    user: "user"
+    password: "admin"
\ No newline at end of file
diff --git a/pipeline.variables.sh b/pipeline.variables.sh
index 215a3b669ef096a1c4453fd7aafa722eba7ee45f..5ce228ea0372bf41fdbe196629323ee04f968de7 100644
--- a/pipeline.variables.sh
+++ b/pipeline.variables.sh
@@ -1 +1 @@
-PROJECT_VERSION_NUMBER="0.5.0"
\ No newline at end of file
+PROJECT_VERSION_NUMBER="0.5.1"
\ No newline at end of file
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
index 065344292ebe61b3f61f7d0795fcee8928a86d98..d199fa256a48631591a45aa9061f153f20f419be 100644
--- a/src/main/resources/application-local.yml
+++ b/src/main/resources/application-local.yml
@@ -19,6 +19,9 @@ logging:
 
 keycloak:
   url: http://localhost:9090
+  master:
+    user: user
+    password: admin
   app:
     realm: participant
     client-id: frontend-cli
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2fccfde57d4322b2218a5cca79f9507bafff1ff2..a6239dd56e4fec575837be122fb16c5d740d9d14 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,8 +34,8 @@ keycloak:
   master:
     realm: master
     client-id: admin-cli
-    user: admin
-    password: admin
+    user: [KEYCLOAK_USER]
+    password: [KEYCLOAK_PASSWORD]
   app:
     realm: [KEYCLOAK_APP_REALM]
     client-id: frontend-cli