diff --git a/deployment/ocelot-social/templates/configmap.template.yaml b/deployment/ocelot-social/templates/configmap.template.yaml
index a0f3fd8e9..1fe42ec7a 100644
--- a/deployment/ocelot-social/templates/configmap.template.yaml
+++ b/deployment/ocelot-social/templates/configmap.template.yaml
@@ -1,12 +1,6 @@
 apiVersion: v1
 kind: ConfigMap
 data:
-  # decomment following lines for S3 bucket to store our images
-  # AWS_ACCESS_KEY_ID: ---toBeSet---
-  # AWS_BUCKET: ocelot-social-uploads
-  # AWS_ENDPOINT: fra1.digitaloceanspaces.com
-  # AWS_REGION: fra1
-  # AWS_SECRET_ACCESS_KEY: ---toBeSet---
   CLIENT_URI: "https://develop-k8s.ocelot.social"
   COMMIT: ""
   GRAPHQL_PORT: "4000"
@@ -22,15 +16,8 @@ data:
   NEO4J_dbms_security_procedures_unrestricted: "algo.*,apoc.*"
   NEO4J_URI: "bolt://neo4j.ocelot-social:7687"
   PUBLIC_REGISTRATION: "false"
-  REDIS_DOMAIN: ---toBeSet(IP)---
-  REDIS_PASSWORD: ---toBeSet---
-  REDIS_PORT: "---toBeSet(Port)---"
   SENTRY_DSN_WEBAPP: "---toBeSet---"
   SENTRY_DSN_BACKEND: "---toBeSet---"
-  SMTP_HOST: "mail.ocelot.social"
-  SMTP_PASSWORD: ---toBeSet---
-  SMTP_PORT: "25"
-  SMTP_USERNAME: ---toBeSet---
   WEBSOCKETS_URI: wss://develop-k8s.ocelot.social/api/graphql
 metadata:
   name: configmap
diff --git a/deployment/ocelot-social/templates/secrets.template.yaml b/deployment/ocelot-social/templates/secrets.template.yaml
index 8309d234e..52991147a 100644
--- a/deployment/ocelot-social/templates/secrets.template.yaml
+++ b/deployment/ocelot-social/templates/secrets.template.yaml
@@ -1,13 +1,24 @@
 apiVersion: v1
 kind: Secret
 data:
+  # decomment following lines for S3 bucket to store our images
+  # AWS_ACCESS_KEY_ID: ---toBeSet---
+  # AWS_BUCKET: ocelot-social-uploads
+  # AWS_ENDPOINT: fra1.digitaloceanspaces.com
+  # AWS_REGION: fra1
+  # AWS_SECRET_ACCESS_KEY: ---toBeSet---
   JWT_SECRET: "Yi8mJjdiNzhCRiZmdi9WZA=="
   PRIVATE_KEY_PASSPHRASE: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
   MAPBOX_TOKEN: "pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
-  NEO4J_USERNAME:
-  NEO4J_PASSWORD:
-  SMTP_USERNAME:
-  SMTP_PASSWORD:
+  NEO4J_USERNAME: ""
+  NEO4J_PASSWORD: ""
+  REDIS_DOMAIN: ---toBeSet(IP)---
+  REDIS_PASSWORD: ---toBeSet---
+  REDIS_PORT: "---toBeSet(Port)---"
+  SMTP_HOST: "mail.ocelot.social"
+  SMTP_PASSWORD: "---toBeSet---"
+  SMTP_PORT: "25"
+  SMTP_USERNAME: "---toBeSet---"
 metadata:
   name: ocelot-social
   namespace: ocelot-social