diff --git a/helm/manifest-service/templates/configMap.yaml b/helm/manifest-service/templates/configMap.yaml
index 5724af4db3be6303d87748ef420eae8c6406a3ad..3f7f1aaa0ba9d65672ec3c9bb4a78c8da0954927 100644
--- a/helm/manifest-service/templates/configMap.yaml
+++ b/helm/manifest-service/templates/configMap.yaml
@@ -5,4 +5,4 @@ metadata:
 data:
   urls.yaml: |
     manifests:
-      {{ .Values.manifests | toYaml }}
+      {{- toYaml .Values.manifests | nindent 6 }}
diff --git a/helm/manifest-service/templates/deployment.yaml b/helm/manifest-service/templates/deployment.yaml
index e50bec79bf585cdbb759416fd0f6c357601f79ec..4916eb01fc7dbc8a4f7ef305311aab7500e6fdba 100644
--- a/helm/manifest-service/templates/deployment.yaml
+++ b/helm/manifest-service/templates/deployment.yaml
@@ -50,11 +50,11 @@ spec:
           volumeMounts:
             - name: manifest-config
               mountPath: /app/config/manifests
-      {{- with .Values.nodeSelector }}
       volumes:
         - name: manifest-config
           configMap:
             name: {{ include "manifest-service.fullname" . }}
+      {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/helm/manifest-service/values.yaml b/helm/manifest-service/values.yaml
index b5c0769411405f2be564c9f46bd052603f82a7e5..4eb6616a46bdd89f645594915634fdab119252df 100644
--- a/helm/manifest-service/values.yaml
+++ b/helm/manifest-service/values.yaml
@@ -6,9 +6,6 @@ replicaCount: 1
 
 containerPort: 8080
 
-environment:
-  manifestUrls: ''
-
 image:
   repository: gitlab.open-xchange.com:4567/frontend/infrastructure/manifest-service
   pullPolicy: IfNotPresent
diff --git a/helm/values/develop.yaml b/helm/values/develop.yaml
index 6d9809eec6568b81e500debd82550c9ce1328ee5..ab176f0aae295a10e71d0e04208c00ebd5d67e1d 100644
--- a/helm/values/develop.yaml
+++ b/helm/values/develop.yaml
@@ -2,11 +2,10 @@ replicaCount: 1
 containerPort: 8080
 manifests:
   - https://manifest-service-dummy.k3s.os.oxui.de/manifest.json
-  - https://manifest-service-dummy.k3s.os.oxui.de/manifest.json
 ingress:
   enabled: true
   hosts:
-    - host: manifest-service.k3s.os.oxui.de
+    - host: manifest-${CI_COMMIT_REF_SLUG}.k3s.os.oxui.de
       paths:
         - path: /
 image: