diff --git a/bin/offline-helm.sh b/bin/offline-helm.sh
index 2fe1dca5b..76dbb6b23 100755
--- a/bin/offline-helm.sh
+++ b/bin/offline-helm.sh
@@ -12,28 +12,24 @@ helm upgrade --install --wait rabbitmq ./charts/rabbitmq --values ./values/rabbi
 helm upgrade --install --wait databases-ephemeral ./charts/databases-ephemeral --values ./values/databases-ephemeral/prod-values.example.yaml
 helm upgrade --install --wait reaper ./charts/reaper
 helm upgrade --install wire-server ./charts/wire-server --values ./values/wire-server/prod-values.example.yaml --values ./values/wire-server/secrets.yaml
-sleep 5m
-./bin/debug_logs.sh
-sleep 5m
-./bin/debug_logs.sh
-sleep 5m
-./bin/debug_logs.sh
+sleep 15m
 # if charts/webapp directory exists
 if [ -d "./charts/webapp" ]; then
-    helm upgrade --install --wait --timeout=15m0s webapp ./charts/webapp --values ./values/webapp/prod-values.example.yaml
+    helm upgrade --install  webapp ./charts/webapp --values ./values/webapp/prod-values.example.yaml
 fi
 
 if [ -d "./charts/account-pages" ]; then
-    helm upgrade --install --wait --timeout=15m0s account-pages ./charts/account-pages --values ./values/account-pages/prod-values.example.yaml
+    helm upgrade --install account-pages ./charts/account-pages --values ./values/account-pages/prod-values.example.yaml
 fi
 
 if [ -d "./charts/team-settings" ]; then
-    helm upgrade --install --wait --timeout=15m0s team-settings ./charts/team-settings --values ./values/team-settings/prod-values.example.yaml --values ./values/team-settings/prod-secrets.example.yaml
+    helm upgrade --install team-settings ./charts/team-settings --values ./values/team-settings/prod-values.example.yaml --values ./values/team-settings/prod-secrets.example.yaml
 fi
 
-helm upgrade --install --wait --timeout=15m0s smallstep-accomp ./charts/smallstep-accomp --values ./values/smallstep-accomp/prod-values.example.yaml
-helm upgrade --install --wait --timeout=15m0s ingress-nginx-controller ./charts/ingress-nginx-controller --values ./values/ingress-nginx-controller/hetzner-ci.example.yaml
+helm upgrade --install smallstep-accomp ./charts/smallstep-accomp --values ./values/smallstep-accomp/prod-values.example.yaml
+helm upgrade --install ingress-nginx-controller ./charts/ingress-nginx-controller --values ./values/ingress-nginx-controller/hetzner-ci.example.yaml
 
+sleep 15m
 echo "Printing all pods status: "
 kubectl get pods --all-namespaces -o wide
 ./bin/debug_logs.sh
diff --git a/bin/offline-secrets.sh b/bin/offline-secrets.sh
index a9cd98ded..68d710f8e 100755
--- a/bin/offline-secrets.sh
+++ b/bin/offline-secrets.sh
@@ -64,7 +64,7 @@ gundeck:
     awsSecretKey: dummysecret
     rabbitmq:
       username: wire-server
-      password: very-secure-password
+      password: verysecurepassword
 nginz:
   secrets:
     zAuth:
diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml
index 369680c84..7ff160d4c 100644
--- a/values/wire-server/prod-values.example.yaml
+++ b/values/wire-server/prod-values.example.yaml
@@ -258,3 +258,7 @@ legalhold:
 federator:
   tls:
     useSharedFederatorSecret: true
+
+background-worker:
+  config:
+    enableFederation: false