diff --git a/os2mo/templates/mo/configmap.yaml b/os2mo/templates/mo/configmap.yaml
deleted file mode 100644
index 92a2da7..0000000
--- a/os2mo/templates/mo/configmap.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-FileCopyrightText: Magenta ApS
-#
-# SPDX-License-Identifier: MPL-2.0
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: mo-config
-  {{- with .Values.annotations }}
-  annotations:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-data:
-{{- range $key, $val := $.Values.os2mo.environment }}
-  {{ $key | quote }}: {{ $val | quote }}
-{{- end }}
diff --git a/os2mo/templates/mo/deployment.yaml b/os2mo/templates/mo/deployment.yaml
index 87ee2e7..8a9b826 100644
--- a/os2mo/templates/mo/deployment.yaml
+++ b/os2mo/templates/mo/deployment.yaml
@@ -104,12 +104,14 @@ spec:
             - name: CONFDB_SHOW_ORG_UNIT_BUTTON
               value: {{ .Values.sdtool.enabled | quote }}
 
-          envFrom:
-          - configMapRef:
-              name: mo-config
-          - configMapRef:
-              name: mo-json-config
-
+            {{- range $name, $value := .Values.os2mo.environment }}
+            - name: {{ $name }}
+              value: {{ $value | quote }}
+            {{- end }}
+            {{- range $name, $value := .Values.os2mo.environment_containing_json }}
+            - name: {{ $name }}
+              value: {{ $value | quote }}
+            {{- end }}
           ports:
             - containerPort: 5000
           resources:
@@ -220,9 +222,14 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.database.mox.secret }}
                   key: db_password
-          envFrom:
-            - configMapRef:
-                name: mo-config
+            {{- range $name, $value := .Values.os2mo.environment }}
+            - name: {{ $name }}
+              value: {{ $value | quote }}
+            {{- end }}
+            {{- range $name, $value := .Values.os2mo.environment_containing_json }}
+            - name: {{ $name }}
+              value: {{ $value | quote }}
+            {{- end }}
           resources:
             {{- toYaml .Values.os2mo.resources | nindent 12 }}
 
diff --git a/os2mo/templates/mo/json-config.yaml b/os2mo/templates/mo/json-config.yaml
deleted file mode 100644
index dd29184..0000000
--- a/os2mo/templates/mo/json-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-FileCopyrightText: Magenta ApS
-#
-# SPDX-License-Identifier: MPL-2.0
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: mo-json-config
-  {{- with .Values.annotations }}
-  annotations:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-data:
-{{ toYaml .Values.os2mo.environment_containing_json | indent 2 }}