diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 816a50477..e984d4d83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,11 +131,10 @@ package-helm:
   stage: package
   before_script:
     - apt update && apt install -y curl
-    - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
+    - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
   script:
-    - helm init --client-only
-    - helm dependency update helm/passbook
-    - helm package helm/passbook
+    - helm dependency update helm
+    - helm package helm
   artifacts:
     paths:
       - passbook-*.tgz
diff --git a/helm/passbook/.helmignore b/helm/.helmignore
similarity index 100%
rename from helm/passbook/.helmignore
rename to helm/.helmignore
diff --git a/helm/passbook/Chart.lock b/helm/Chart.lock
similarity index 86%
rename from helm/passbook/Chart.lock
rename to helm/Chart.lock
index 0fa6d4fd5..16f689718 100644
--- a/helm/passbook/Chart.lock
+++ b/helm/Chart.lock
@@ -6,4 +6,4 @@ dependencies:
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 9.5.1
 digest: sha256:f18b5dc8d0be13d584407405c60d10b6b84d25f7fa8aaa3dd0e5385c38f5c516
-generated: "2019-11-07T10:23:07.259176+01:00"
+generated: "2019-12-14T13:33:48.4341939Z"
diff --git a/helm/passbook/Chart.yaml b/helm/Chart.yaml
similarity index 100%
rename from helm/passbook/Chart.yaml
rename to helm/Chart.yaml
diff --git a/helm/passbook/requirements.lock b/helm/requirements.lock
similarity index 100%
rename from helm/passbook/requirements.lock
rename to helm/requirements.lock
diff --git a/helm/passbook/requirements.yaml b/helm/requirements.yaml
similarity index 100%
rename from helm/passbook/requirements.yaml
rename to helm/requirements.yaml
diff --git a/helm/passbook/templates/NOTES.txt b/helm/templates/NOTES.txt
similarity index 100%
rename from helm/passbook/templates/NOTES.txt
rename to helm/templates/NOTES.txt
diff --git a/helm/passbook/templates/_helpers.tpl b/helm/templates/_helpers.tpl
similarity index 100%
rename from helm/passbook/templates/_helpers.tpl
rename to helm/templates/_helpers.tpl
diff --git a/helm/passbook/templates/configmap.yaml b/helm/templates/configmap.yaml
similarity index 100%
rename from helm/passbook/templates/configmap.yaml
rename to helm/templates/configmap.yaml
diff --git a/helm/passbook/templates/ingress.yaml b/helm/templates/ingress.yaml
similarity index 100%
rename from helm/passbook/templates/ingress.yaml
rename to helm/templates/ingress.yaml
diff --git a/helm/passbook/templates/prom-rules.yaml b/helm/templates/prom-rules.yaml
similarity index 100%
rename from helm/passbook/templates/prom-rules.yaml
rename to helm/templates/prom-rules.yaml
diff --git a/helm/passbook/templates/secret.yaml b/helm/templates/secret.yaml
similarity index 100%
rename from helm/passbook/templates/secret.yaml
rename to helm/templates/secret.yaml
diff --git a/helm/passbook/templates/static-deployment.yaml b/helm/templates/static-deployment.yaml
similarity index 100%
rename from helm/passbook/templates/static-deployment.yaml
rename to helm/templates/static-deployment.yaml
diff --git a/helm/passbook/templates/static-service.yaml b/helm/templates/static-service.yaml
similarity index 100%
rename from helm/passbook/templates/static-service.yaml
rename to helm/templates/static-service.yaml
diff --git a/helm/passbook/templates/static-sm.yaml b/helm/templates/static-sm.yaml
similarity index 100%
rename from helm/passbook/templates/static-sm.yaml
rename to helm/templates/static-sm.yaml
diff --git a/helm/passbook/templates/web-deployment.yaml b/helm/templates/web-deployment.yaml
similarity index 100%
rename from helm/passbook/templates/web-deployment.yaml
rename to helm/templates/web-deployment.yaml
diff --git a/helm/passbook/templates/web-service.yaml b/helm/templates/web-service.yaml
similarity index 100%
rename from helm/passbook/templates/web-service.yaml
rename to helm/templates/web-service.yaml
diff --git a/helm/passbook/templates/web-sm.yaml b/helm/templates/web-sm.yaml
similarity index 100%
rename from helm/passbook/templates/web-sm.yaml
rename to helm/templates/web-sm.yaml
diff --git a/helm/passbook/templates/worker-deployment.yaml b/helm/templates/worker-deployment.yaml
similarity index 100%
rename from helm/passbook/templates/worker-deployment.yaml
rename to helm/templates/worker-deployment.yaml
diff --git a/helm/passbook/values.yaml b/helm/values.yaml
similarity index 100%
rename from helm/passbook/values.yaml
rename to helm/values.yaml