diff --git a/stable/v3io-keycloak/Chart.yaml b/stable/v3io-keycloak/Chart.yaml
index 7453f706b..5fc66486c 100644
--- a/stable/v3io-keycloak/Chart.yaml
+++ b/stable/v3io-keycloak/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: v3io-keycloak
-version: 0.1.5
+version: 0.1.6
 appVersion: 20.0.5
 description: Keycloak With V3IO MySQL Database
 maintainers:
diff --git a/stable/v3io-keycloak/templates/db-creds.yaml b/stable/v3io-keycloak/templates/db-creds.yaml
index 9f169a79b..fbb40a25e 100644
--- a/stable/v3io-keycloak/templates/db-creds.yaml
+++ b/stable/v3io-keycloak/templates/db-creds.yaml
@@ -9,7 +9,7 @@ metadata:
 data:
   # for mysql
   DB_USER: {{ include "v3io-keycloak.dbUser" . | b64enc }}
-  DB_PASSWORD: {{ $password | b64enc }}
+  DB_PASSWORD: {{ $password | trim | b64enc }}
 
   # for keycloak
-  db-password: {{ $password | b64enc }}
+  db-password: {{ $password | trim | b64enc }}
diff --git a/stable/v3io-keycloak/templates/master-creds.yaml b/stable/v3io-keycloak/templates/master-creds.yaml
index afdc461d5..e175ead23 100644
--- a/stable/v3io-keycloak/templates/master-creds.yaml
+++ b/stable/v3io-keycloak/templates/master-creds.yaml
@@ -6,5 +6,5 @@ metadata:
   labels:
     {{ include "v3io-keycloak.labels" . | nindent 4 }}
 data:
-  masterPassword: {{ include "v3io-keycloak.masterPassword" . | b64enc }}
+  masterPassword: {{ include "v3io-keycloak.masterPassword" . | trim | b64enc }}
 {{- end }}