diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 87a2325e25a3fb1e711f87851d720c9194acbce0..a031c30f57aa11bbd4d57dbc13fe78a7d4be56ea 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -242,13 +242,18 @@ spec:
           - name: ozgcloud_notification_eingangsbestaetigung_replyAllowed
             value: {{ quote (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
           {{- end }}
+          {{- if ((.Values.ozgcloud).xdomea).behoerdenschluessel }}
           - name: ozgcloud_xdomea_behoerdenschluessel
             value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluessel | quote }}
+          {{- end }}
+          {{- if ((.Values.ozgcloud).xdomea).behoerdenschluesselUri }}
           - name: ozgcloud_xdomea_behoerdenschluesselUri
             value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselUri}}
+          {{- end }}
+          {{- if ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion }}
           - name: ozgcloud_xdomea_behoerdenschluesselVersion
             value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
-
+          {{- end }}
           {{- if (.Values.ozgcloud).processors}}
           {{- range $processor_index, $processor := (.Values.ozgcloud).processors }}
           - name: ozgcloud_processors_{{ $processor_index }}_address
diff --git a/src/test/helm/deployment_xdomea_test.yaml b/src/test/helm/deployment_xdomea_test.yaml
index e60d6fa7251e2694145071eee67b594dd2237845..60688146e6b4eda3ce1e1c004558fe7936e92df6 100644
--- a/src/test/helm/deployment_xdomea_test.yaml
+++ b/src/test/helm/deployment_xdomea_test.yaml
@@ -35,7 +35,7 @@ set:
     bezeichner: helm
   imagePullSecret: test-image-pull-secret
 tests:
-  - it: should not require on behoerdenschlüssel properties
+  - it: should not contain behoerdenschlüssel properties if values are missing
     set:
     # note: explicitly non-set behoerdenschlüssel properties
     asserts:
@@ -43,14 +43,17 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_xdomea_behoerdenschluessel
+          any: true
       - notContains:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_xdomea_behoerdenschluesselUri
+          any: true
       - notContains:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_xdomea_behoerdenschluesselVersion
+          any: true
   - it: should set (optional) behoerdenschlüssel properties
     set:
       ozgcloud: