diff --git a/otf-camunda/helm/otf-camunda/values.yaml b/otf-camunda/helm/otf-camunda/values.yaml
index 0c2edff..4e42c06 100644
--- a/otf-camunda/helm/otf-camunda/values.yaml
+++ b/otf-camunda/helm/otf-camunda/values.yaml
@@ -22,8 +22,8 @@
       host: localhost:18720,localhost:18720,localhost:18720
       replicaSet: otf-rs-prod2
       database: otf
-    username: otfuser
-    password: Today.123
+    username: your-mongo-username
+    password: your-mongo-password
   camunda:
     executors_active:
       dev: true
@@ -39,8 +39,8 @@
         url: localhost:3306/otf_st-camunda
       prod:
         url: localhost:3306/otf-camunda
-      username: otfuser
-      password: Today.123
+      username: your-mysql-username
+      password: your-mysql-password
     router:
       config:
         dev: mysqlRouterConfig-dev.ini
diff --git a/otf-frontend/helm/otf-frontend/templates/deployment.yaml b/otf-frontend/helm/otf-frontend/templates/deployment.yaml
index 70cbeb5..7bb59d1 100644
--- a/otf-frontend/helm/otf-frontend/templates/deployment.yaml
+++ b/otf-frontend/helm/otf-frontend/templates/deployment.yaml
@@ -205,8 +205,6 @@
               key: mongodb-username
               optional: false
         - name: MONGO_PASSWORD
-          #value: otf.123
-          #value: Today.123
           valueFrom:
             secretKeyRef:
               name: {{ .Values.one_click.mongo.secret_name}}
diff --git a/otf-helm/otf/charts/databases/mongodb/files/docker-entrypoint-initdb.d/one.js b/otf-helm/otf/charts/databases/mongodb/files/docker-entrypoint-initdb.d/one.js
index 825148e..2e218a1 100644
--- a/otf-helm/otf/charts/databases/mongodb/files/docker-entrypoint-initdb.d/one.js
+++ b/otf-helm/otf/charts/databases/mongodb/files/docker-entrypoint-initdb.d/one.js
@@ -1,6 +1,6 @@
 sleep(12000);
 use admin;
-db.createUser({user: "otfuser", pwd: "Today.123", roles: [ { role: "readWrite", db: "test" } ]})
+db.createUser({user: "your-mongo-username", pwd: "your-mongo-password", roles: [ { role: "readWrite", db: "test" } ]})
 use otf;
 db.users.insert({"permissions":["user"], "enabled":true, "password":"$2a$14$QWEuhquhhT.1dtVsmXq0QOxOMSmInjvQtr43Jbyz07nEeTbABdwqa", "firstName":"username", "lastname":"username", "email":"username", "isVerified":true})
 db.users.insert({"permissions":["admin"], "enabled":true, "password":"$2a$14$QWEuhquhhT.1dtVsmXq0QOxOMSmInjvQtr43Jbyz07nEeTbABdwqa", "firstName":"otf", "lastname":"user", "email":"otfuser@email.com", "isVerified":true})
diff --git a/otf-helm/otf/charts/databases/mongodb/values.yaml b/otf-helm/otf/charts/databases/mongodb/values.yaml
index 0683160..0c6f215 100644
--- a/otf-helm/otf/charts/databases/mongodb/values.yaml
+++ b/otf-helm/otf/charts/databases/mongodb/values.yaml
@@ -76,8 +76,8 @@
 ## MongoDB custom user and database
 ## ref: https://github.com/bitnami/bitnami-docker-mongodb/blob/master/README.md#creating-a-user-and-database-on-first-run
 ##
-mongodbUsername: otfuser
-mongodbPassword: Today.123
+mongodbUsername: your-mongo-username
+mongodbPassword: your-mongo-password
 mongodbDatabase: otf
 mongodbIP: ""
 
diff --git a/otf-robot-test-head/helm/otf-robot-test-head/values.yaml b/otf-robot-test-head/helm/otf-robot-test-head/values.yaml
index 38957b9..5f916a9 100644
--- a/otf-robot-test-head/helm/otf-robot-test-head/values.yaml
+++ b/otf-robot-test-head/helm/otf-robot-test-head/values.yaml
@@ -37,28 +37,8 @@
     OTF_MONGO_HOSTS: "10.0.136.214:27017/"
     OTF_MONGO_DBOTF: "otf_st"
     OTF_MONGO_REPLICASET: "rs0"
-  username: "otfuser"
-  password: "Today.123"
+  username: "your-mongo-username"
+  password: "your-mongo-password"
 
-# mongo:
-#   prod:
-#     OTF_MONGO_HOSTS: "localhost:18720,localhost:18720,localhost:18720/"
-#     OTF_MONGO_DBOTF: "otf"
-#     OTF_MONGO_REPLICASET: "otf-rs-prod2"
-#   dev:
-#     OTF_MONGO_HOSTS: "10.0.136.214:27017/"
-#     #"localhost:27017,localhost:27017,localhost:27017/"
-#     OTF_MONGO_DBOTF: "otf"
-#     OTF_MONGO_REPLICASET: "rs0"
-#     # "mongoOTF"
-#   st:
-#     OTF_MONGO_HOSTS: "localhost:27017,localhost:27017,localhost:27017/"
-#     OTF_MONGO_DBOTF: "otf_st"
-#     OTF_MONGO_REPLICASET: "mongoOTF"
-
-#   username: "otfuser"
-#   # "username"
-#   password: "Today.123"
-#   # "password"
 sharedSecret: otf-aaf-credential-generator
 
diff --git a/otf-service-api/helm/otf-service-api/templates/deployment.yaml b/otf-service-api/helm/otf-service-api/templates/deployment.yaml
index 819085c..069f8ac 100644
--- a/otf-service-api/helm/otf-service-api/templates/deployment.yaml
+++ b/otf-service-api/helm/otf-service-api/templates/deployment.yaml
@@ -177,8 +177,6 @@
               key: mongodb-username
               optional: false
         - name: OTF_MONGO_PASSWORD
-          #value: otf.123
-          #value: Today.123
           valueFrom:
             secretKeyRef:
               name: {{ .Values.one_click.mongo.secret_name}}