diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl
index c87e1565cbd1850ccc8e5376bafbcf4c060e471b..71ec25b49aefabe77c338e72aff8b8a3dbb22c7c 100644
--- a/src/main/helm/templates/_helpers.tpl
+++ b/src/main/helm/templates/_helpers.tpl
@@ -132,10 +132,18 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- required "elsterTransferOperator.namespace must be set" (.Values.elsterTransferOperator).namespace -}}
 {{- end -}}
 
+{{- define "app.ozgcloudBezeichner" -}}
+{{- required "ozgcloud.bezeichner must be set" (.Values.ozgcloud).bezeichner -}}
+{{- end -}}
+
+{{- define "app.baseUrl" -}}
+{{- required "baseUrl must be set" .Values.baseUrl }}
+{{- end -}}
+
 {{- define "app.alfaHost" -}}
 {{- if .Values.alfaHost -}}
 {{ .Values.alfaHost | quote }}
-{{- else if and (.Values.ozgcloud).bezeichner .Values.baseUrl -}}
-{{ print "https://" (.Values.ozgcloud).bezeichner "." .Values.baseUrl | quote }}
+{{- else -}}
+{{ printf "https://%s.%s" (include "app.ozgcloudBezeichner" .) (include "app.baseUrl" .) }}
 {{- end -}}
 {{- end -}}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index e5995fb3d292dc80e04e4a841691905a44504275..65b3f7d2055109abff0eea24180293bbc85c5c0e 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -263,11 +263,8 @@ spec:
             value: "false"
           {{- end }}
 
-          {{- $alfaHost := (include "app.alfaHost" .) -}}
-          {{- if $alfaHost }}
           - name: ozgcloud_alfa_host
             value: {{ include "app.alfaHost" . }}
-          {{- end }}
           - name: ozgcloud_vorgangManager_serviceAddress
             value: {{ include "app.ozgcloud_vorgangmanager_address" . }}
 
diff --git a/src/test/helm/deployment_alfa_host_test.yaml b/src/test/helm/deployment_alfa_host_test.yaml
index 37a6fdd0b49471db316852ea77c31e2f7448d17d..7cd54caced16b90e219fe7cc58d4fd83d1aeb3b2 100644
--- a/src/test/helm/deployment_alfa_host_test.yaml
+++ b/src/test/helm/deployment_alfa_host_test.yaml
@@ -53,33 +53,19 @@ tests:
           content:
             name: ozgcloud_alfa_host
             value: https://hamburg.mein-kreis.de
-  - it: should not set alfa host if bezeichner is not set
+  - it: should fail if bezeichner is not set
     set:
       baseUrl: test.company.local
       ozgcloud:
         bezeichner:
     asserts:
-      - notContains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_alfa_host
-  - it: should not set alfa host if base url is not set
+      - failedTemplate:
+          errorMessage: "ozgcloud.bezeichner must be set"
+  - it: should fail if base url is not set
     set:
       baseUrl:
       ozgcloud:
         bezeichner: helm
     asserts:
-      - notContains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_alfa_host
-  - it: should not set alfa host if both bezeichner and base url are not set
-    set:
-      baseUrl:
-      ozgcloud:
-        bezeichner:
-    asserts:
-      - notContains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_alfa_host
+      - failedTemplate:
+          errorMessage: "baseUrl must be set"