diff --git a/changelog.d/5-internal/helm-test b/changelog.d/5-internal/helm-test
index 14bfeb22a3..2bd90dfe39 100644
--- a/changelog.d/5-internal/helm-test
+++ b/changelog.d/5-internal/helm-test
@@ -1 +1 @@
-charts: Mark all test resources to be only created while running tests
\ No newline at end of file
+charts: Mark all service/secret/configmap test resources to be re-created by defining them as helm hooks (#3037, #3049)
diff --git a/charts/brig/templates/tests/brig-integration.yaml b/charts/brig/templates/tests/brig-integration.yaml
index 81020f9d00..c8cfa602f1 100644
--- a/charts/brig/templates/tests/brig-integration.yaml
+++ b/charts/brig/templates/tests/brig-integration.yaml
@@ -3,7 +3,8 @@ kind: Service
 metadata:
   name: "brig-integration"
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
   labels:
     app: brig-integration
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
diff --git a/charts/brig/templates/tests/configmap.yaml b/charts/brig/templates/tests/configmap.yaml
index 4d409eb59f..56667e55ed 100644
--- a/charts/brig/templates/tests/configmap.yaml
+++ b/charts/brig/templates/tests/configmap.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: "brig-integration"
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 data:
   integration.yaml: |
     brig:
diff --git a/charts/brig/templates/tests/nginz-service.yaml b/charts/brig/templates/tests/nginz-service.yaml
index ec1b22284b..6eda016c82 100644
--- a/charts/brig/templates/tests/nginz-service.yaml
+++ b/charts/brig/templates/tests/nginz-service.yaml
@@ -6,7 +6,8 @@ kind: Service
 metadata:
   name: nginz-integration-http
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 spec:
   type: ClusterIP
   ports:
diff --git a/charts/brig/templates/tests/secret.yaml b/charts/brig/templates/tests/secret.yaml
index bda96d4f3f..69ce7e671e 100644
--- a/charts/brig/templates/tests/secret.yaml
+++ b/charts/brig/templates/tests/secret.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: brig-integration-secrets
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 data:
   # These "secrets" are only used in tests and are therefore safe to be stored unencrypted
   provider-privatekey.pem: |
diff --git a/charts/cargohold/templates/tests/configmap.yaml b/charts/cargohold/templates/tests/configmap.yaml
index 1a52056adb..18a5b29b22 100644
--- a/charts/cargohold/templates/tests/configmap.yaml
+++ b/charts/cargohold/templates/tests/configmap.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: "cargohold-integration"
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 data:
   integration.yaml: |
     cargohold:
diff --git a/charts/federator/templates/tests/configmap.yaml b/charts/federator/templates/tests/configmap.yaml
index b845f3d401..44146840bd 100644
--- a/charts/federator/templates/tests/configmap.yaml
+++ b/charts/federator/templates/tests/configmap.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: "federator-integration"
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 data:
   integration.yaml: |
     federatorInternal:
diff --git a/charts/galley/templates/tests/configmap.yaml b/charts/galley/templates/tests/configmap.yaml
index 20036f2f15..89d7d589de 100644
--- a/charts/galley/templates/tests/configmap.yaml
+++ b/charts/galley/templates/tests/configmap.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: "galley-integration"
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 data:
   integration.yaml: |
     galley:
diff --git a/charts/galley/templates/tests/galley-integration.yaml b/charts/galley/templates/tests/galley-integration.yaml
index d7b64bf5ba..c543eb2048 100644
--- a/charts/galley/templates/tests/galley-integration.yaml
+++ b/charts/galley/templates/tests/galley-integration.yaml
@@ -3,7 +3,8 @@ kind: Service
 metadata:
   name: "galley-integration"
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
   labels:
     app: galley-integration
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
diff --git a/charts/galley/templates/tests/secret.yaml b/charts/galley/templates/tests/secret.yaml
index ec0e5624b2..d58a49c360 100644
--- a/charts/galley/templates/tests/secret.yaml
+++ b/charts/galley/templates/tests/secret.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: galley-integration-secrets
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 data:
   # These "secrets" are only used in tests and are therefore safe to be stored unencrypted
   provider-privatekey.pem: |
diff --git a/charts/gundeck/templates/tests/configmap.yaml b/charts/gundeck/templates/tests/configmap.yaml
index 004d58f060..6829860247 100644
--- a/charts/gundeck/templates/tests/configmap.yaml
+++ b/charts/gundeck/templates/tests/configmap.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: "gundeck-integration"
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 data:
   integration.yaml: |
     gundeck:
diff --git a/charts/spar/templates/tests/configmap.yaml b/charts/spar/templates/tests/configmap.yaml
index 8773895447..2eb1966099 100644
--- a/charts/spar/templates/tests/configmap.yaml
+++ b/charts/spar/templates/tests/configmap.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: "spar-integration"
   annotations:
-    "helm.sh/hook": test
+    "helm.sh/hook": post-install
+    "helm.sh/hook-delete-policy": before-hook-creation
 data:
   integration.yaml: |
     brig: