diff --git a/aks-store-all-in-one.yaml b/aks-store-all-in-one.yaml
index ca6b917a..b9e6b2ab 100644
--- a/aks-store-all-in-one.yaml
+++ b/aks-store-all-in-one.yaml
@@ -68,6 +68,14 @@ kind: ConfigMap
 metadata:
   name: rabbitmq-enabled-plugins
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: rabbitmq-secrets
+data:
+  RABBITMQ_DEFAULT_USER: dXNlcm5hbWU=
+  RABBITMQ_DEFAULT_PASS: cGFzc3dvcmQ=
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -93,11 +101,9 @@ spec:
               name: rabbitmq-amqp
             - containerPort: 15672
               name: rabbitmq-http
-          env:
-            - name: RABBITMQ_DEFAULT_USER
-              value: "username"
-            - name: RABBITMQ_DEFAULT_PASS
-              value: "password"
+          envFrom:
+            - secretRef:
+                name: rabbitmq-secrets
           resources:
             requests:
               cpu: 10m
@@ -151,6 +157,24 @@ spec:
       targetPort: 15672
   type: ClusterIP
 ---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: order-service-configs
+data:
+  ORDER_QUEUE_PORT: "5672"
+  ORDER_QUEUE_HOSTNAME: "rabbitmq"
+  ORDER_QUEUE_NAME: "orders"
+  FASTIFY_ADDRESS: "0.0.0.0"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: order-service-secrets
+data:
+  ORDER_QUEUE_USERNAME: dXNlcm5hbWU=
+  ORDER_QUEUE_PASSWORD: cGFzc3dvcmQ=
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -172,19 +196,11 @@ spec:
           image: ghcr.io/azure-samples/aks-store-demo/order-service:2.0.0
           ports:
             - containerPort: 3000
-          env:
-            - name: ORDER_QUEUE_HOSTNAME
-              value: "rabbitmq"
-            - name: ORDER_QUEUE_PORT
-              value: "5672"
-            - name: ORDER_QUEUE_USERNAME
-              value: "username"
-            - name: ORDER_QUEUE_PASSWORD
-              value: "password"
-            - name: ORDER_QUEUE_NAME
-              value: "orders"
-            - name: FASTIFY_ADDRESS
-              value: "0.0.0.0"
+          envFrom:
+            - configMapRef:
+                name: order-service-configs
+            - secretRef:
+                name: order-service-secrets
           resources:
             requests:
               cpu: 1m
diff --git a/aks-store-ingress-quickstart.yaml b/aks-store-ingress-quickstart.yaml
index 55c93ac1..94fb97b7 100644
--- a/aks-store-ingress-quickstart.yaml
+++ b/aks-store-ingress-quickstart.yaml
@@ -1,3 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: rabbitmq-secrets
+data:
+  RABBITMQ_DEFAULT_USER: dXNlcm5hbWU=
+  RABBITMQ_DEFAULT_PASS: cGFzc3dvcmQ=
+---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -23,11 +31,9 @@ spec:
               name: rabbitmq-amqp
             - containerPort: 15672
               name: rabbitmq-http
-          env:
-            - name: RABBITMQ_DEFAULT_USER
-              value: "username"
-            - name: RABBITMQ_DEFAULT_PASS
-              value: "password"
+          envFrom:
+            - secretRef:
+                name: rabbitmq-secrets
           resources:
             requests:
               cpu: 10m
@@ -89,6 +95,24 @@ spec:
       targetPort: 15672
   type: ClusterIP
 ---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: order-service-configs
+data:
+  ORDER_QUEUE_PORT: "5672"
+  ORDER_QUEUE_HOSTNAME: "rabbitmq"
+  ORDER_QUEUE_NAME: "orders"
+  FASTIFY_ADDRESS: "0.0.0.0"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: order-service-secrets
+data:
+  ORDER_QUEUE_USERNAME: dXNlcm5hbWU=
+  ORDER_QUEUE_PASSWORD: cGFzc3dvcmQ=
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -110,19 +134,11 @@ spec:
           image: ghcr.io/azure-samples/aks-store-demo/order-service:2.0.0
           ports:
             - containerPort: 3000
-          env:
-            - name: ORDER_QUEUE_HOSTNAME
-              value: "rabbitmq"
-            - name: ORDER_QUEUE_PORT
-              value: "5672"
-            - name: ORDER_QUEUE_USERNAME
-              value: "username"
-            - name: ORDER_QUEUE_PASSWORD
-              value: "password"
-            - name: ORDER_QUEUE_NAME
-              value: "orders"
-            - name: FASTIFY_ADDRESS
-              value: "0.0.0.0"
+          envFrom:
+            - configMapRef:
+                name: order-service-configs
+            - secretRef:
+                name: order-service-secrets
           resources:
             requests:
               cpu: 1m
diff --git a/charts/aks-store-demo/templates/mongodb.yaml b/charts/aks-store-demo/templates/mongodb.yaml
index 39e02afa..1bb06fc7 100644
--- a/charts/aks-store-demo/templates/mongodb.yaml
+++ b/charts/aks-store-demo/templates/mongodb.yaml
@@ -60,4 +60,4 @@ spec:
   selector:
     app: mongodb
   type: ClusterIP
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/aks-store-demo/templates/order-service.yaml b/charts/aks-store-demo/templates/order-service.yaml
index 3fb5190d..d07ace06 100644
--- a/charts/aks-store-demo/templates/order-service.yaml
+++ b/charts/aks-store-demo/templates/order-service.yaml
@@ -112,4 +112,4 @@ spec:
     port: 3000
     targetPort: 3000
   selector:
-    app: order-service
\ No newline at end of file
+    app: order-service
diff --git a/charts/aks-store-demo/templates/rabbitmq.yaml b/charts/aks-store-demo/templates/rabbitmq.yaml
index 272ac12b..fd26c370 100644
--- a/charts/aks-store-demo/templates/rabbitmq.yaml
+++ b/charts/aks-store-demo/templates/rabbitmq.yaml
@@ -95,4 +95,4 @@ spec:
       port: 15672
       targetPort: 15672
   type: ClusterIP
-{{- end }}
\ No newline at end of file
+{{- end }}