diff --git a/.gitlab/ci/test-helm-2to3.gitlab-ci.yml b/.gitlab/ci/test-helm-2to3.gitlab-ci.yml
index 45dd135253b5cf2c78164f207756c4ddc6a46503..66c5727fa9651590191e443ad019bf09097cd202 100644
--- a/.gitlab/ci/test-helm-2to3.gitlab-ci.yml
+++ b/.gitlab/ci/test-helm-2to3.gitlab-ci.yml
@@ -48,11 +48,11 @@ test-helm-2to3:
     - helm2 get production
     - helm2 get values production --output json | grep "postgres://user:testing-password@production-postgresql:5432/production"
     - ./test/verify-deployment-database production postgresql
-    - helm3 2to3 convert --tiller-out-cluster production
-    - helm3 2to3 convert --tiller-out-cluster production-postgresql
+    - helm3 2to3 convert --release-storage configmaps --tiller-out-cluster --tiller-ns "$KUBE_NAMESPACE" production
+    - helm3 2to3 convert --release-storage configmaps --tiller-out-cluster --tiller-ns "$KUBE_NAMESPACE" production-postgresql
     - helm2 list
     - helm3 list
-    - helm 2to3 cleanup
+    - helm 2to3 cleanup --release-storage configmaps --tiller-out-cluster --tiller-ns "$KUBE_NAMESPACE"
     - helm2 list
     - export AUTO_DEVOPS_HELM_MAJOR_VERSION=3
     - auto-deploy download_chart