diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e7cee4488d7b077622aa5705c7e506ffd2d9378..d6f54b8304e5021b999228aabd12beb6fc95ceab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,6 +83,7 @@ deploy review:
   script:
     - cd deploy/overlays/review
     - kustomize edit set image registry.edugit.org/teckids/team-pr/teckids.org:$CI_COMMIT_REF_NAME@$(cat ../../../DIGESTFILE)
+    - kustomize edit set nameprefix $CI_COMMIT_REF_SLUG
     - kustomize build | sed s/__REVIEW_NAME__/$CI_COMMIT_REF_SLUG/g > output.yaml
     - kubectl --kubeconfig=/tmp/kubeconfig apply -f output.yaml
 
@@ -95,7 +96,7 @@ delete review:
   before_script:
     - echo $KUBECONFIG | base64 -d > /tmp/kubeconfig
     - cd deploy/overlays/review
-    - kustomize build | envsubst > output.yaml
+    - kustomize build | sed s/__REVIEW_NAME__/$CI_COMMIT_REF_SLUG/g > output.yaml
   script:
     - kubectl --kubeconfig=/tmp/kubeconfig delete -f output.yaml
   when: manual
diff --git a/deploy/base/deployment.yaml b/deploy/base/deployment.yaml
index 20fee733c7905054ed31748f24b7c707ff5d9d8f..37d1473b57cbeab790fc554da59db5990d637b7f 100644
--- a/deploy/base/deployment.yaml
+++ b/deploy/base/deployment.yaml
@@ -19,22 +19,19 @@ spec:
       - name: caddy
         image: registry.edugit.org/teckids/team-pr/teckids.org:IMAGE_TAG
         ports:
-        - containerPort: 80
-          livenessProbe:
-            httpGet:
-              scheme: HTTP
-              port: http
-              path: /
-            timeoutSeconds: 10
-            initialDelaySeconds: 60
-          name: adressbuch
-          ports:
-            - containerPort: 80
-              name: http
-          readinessProbe:
-            httpGet:
-              scheme: HTTP
-              port: http
-              path: /
-            timeoutSeconds: 10
-            initialDelaySeconds: 120
+          - containerPort: 80
+            name: http
+        livenessProbe:
+          httpGet:
+            scheme: HTTP
+            port: http
+            path: /
+          timeoutSeconds: 10
+          initialDelaySeconds: 60
+        readinessProbe:
+          httpGet:
+            scheme: HTTP
+            port: http
+            path: /
+          timeoutSeconds: 10
+          initialDelaySeconds: 120