diff --git a/os2mo/templates/mo/naldo-configmap.yaml b/os2mo/templates/mo/naldo-configmap.yaml
deleted file mode 100644
index 0ca5f0b..0000000
--- a/os2mo/templates/mo/naldo-configmap.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-FileCopyrightText: Magenta ApS
-#
-# SPDX-License-Identifier: MPL-2.0
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: naldo-config
-  {{- with .Values.annotations }}
-  annotations:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-data:
-{{- range $key, $val := $.Values.os2mo.naldo.environment }}
-  {{ $key | quote }}: {{ $val | quote }}
-{{- end }}
diff --git a/os2mo/templates/mo/naldo-deployment.yaml b/os2mo/templates/mo/naldo-deployment.yaml
index 47a74d8..583a47c 100644
--- a/os2mo/templates/mo/naldo-deployment.yaml
+++ b/os2mo/templates/mo/naldo-deployment.yaml
@@ -28,9 +28,10 @@ spec:
           env:
             - name: PUBLIC_BASE_URL
               value: "https://{{ .Values.ingress.hostname }}"
-          envFrom:
-            - configMapRef:
-                name: naldo-config
+            {{- range $name, $value := .Values.os2mo.naldo.environment }}
+            - name: {{ $name }}
+              value: {{ $value | quote }}
+            {{- end }}
           ports:
             - containerPort: 3000
           resources: