diff --git a/deployment/helm/charts/ocelot-social/templates/webapp/configmap.yml b/deployment/helm/charts/ocelot-social/templates/webapp/configmap.yml
new file mode 100644
index 0000000000..f5ad51a210
--- /dev/null
+++ b/deployment/helm/charts/ocelot-social/templates/webapp/configmap.yml
@@ -0,0 +1,6 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ .Release.Name }}-webapp-env
+data:
+{{ .Values.webapp.env | toYaml | indent 2 }}
diff --git a/deployment/helm/charts/ocelot-social/templates/webapp/deployment.yaml b/deployment/helm/charts/ocelot-social/templates/webapp/deployment.yaml
index 7e251b8fad..f23705db18 100644
--- a/deployment/helm/charts/ocelot-social/templates/webapp/deployment.yaml
+++ b/deployment/helm/charts/ocelot-social/templates/webapp/deployment.yaml
@@ -28,5 +28,7 @@ spec:
         - name: GRAPHQL_URI
           value: "http://{{ .Release.Name }}-backend:4000"
         envFrom:
+        - configMapRef:
+            name: {{ .Release.Name }}-webapp-env
         - secretRef:
             name: {{ .Release.Name }}-webapp-secret-env