diff --git a/.gitignore b/.gitignore
index 29b636a..e5aa5b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .idea
-*.iml
\ No newline at end of file
+*.iml
+target
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..6f00949
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,40 @@
+pipeline {
+    agent {
+        kubernetes {
+            label 'helm'
+        }
+    }
+    stages {
+        stage('Test') {
+            steps {
+                container('chart-testing') {
+                    sh "chart_test.sh --no-install --all"
+                }
+            }
+        }
+        stage('Package') {
+            steps {
+                container('chart-testing'){
+                    sh 'mkdir target'
+                    sh 'for dir in charts/*; do helm package --destination target "$dir"; done'
+                }
+            }
+        }
+        stage('Deploy') {
+            when {
+                branch 'master'
+            }
+            steps {
+                container('vault') {
+                    script {
+                        env.NEXUS_USER = sh(script: 'vault read -field=username secret/ops/account/nexus', returnStdout: true)
+                        env.NEXUS_PWD = sh(script: 'vault read -field=password secret/ops/account/nexus', returnStdout: true)
+                    }
+                }
+                container('alpine') {
+                    sh 'set +x; for chart in target/*; do curl -L -u $NEXUS_USER:$NEXUS_PWD http://registry.molgenis.org/repository/helm/ --upload-file "$chart"; done'
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/molgenis-httpd/.helmignore b/charts/molgenis-httpd/.helmignore
similarity index 100%
rename from molgenis-httpd/.helmignore
rename to charts/molgenis-httpd/.helmignore
diff --git a/molgenis-httpd/Chart.yaml b/charts/molgenis-httpd/Chart.yaml
similarity index 63%
rename from molgenis-httpd/Chart.yaml
rename to charts/molgenis-httpd/Chart.yaml
index 4fe30f7..505dd03 100644
--- a/molgenis-httpd/Chart.yaml
+++ b/charts/molgenis-httpd/Chart.yaml
@@ -5,4 +5,8 @@ name: molgenis-httpd
 version: 0.1.0
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
-icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-httpd/catalogIcon-molgenis-httpd.svg
\ No newline at end of file
+icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-httpd/catalogIcon-molgenis-httpd.svg
+home: http://httpd.apache.org
+maintainers:
+- name: sidohaakma
+- name: fdlk
diff --git a/molgenis-httpd/README.md b/charts/molgenis-httpd/README.md
similarity index 100%
rename from molgenis-httpd/README.md
rename to charts/molgenis-httpd/README.md
diff --git a/molgenis-httpd/catalogIcon-molgenis-httpd.svg b/charts/molgenis-httpd/catalogIcon-molgenis-httpd.svg
similarity index 100%
rename from molgenis-httpd/catalogIcon-molgenis-httpd.svg
rename to charts/molgenis-httpd/catalogIcon-molgenis-httpd.svg
diff --git a/molgenis-httpd/questions.yml b/charts/molgenis-httpd/questions.yml
similarity index 100%
rename from molgenis-httpd/questions.yml
rename to charts/molgenis-httpd/questions.yml
diff --git a/molgenis-httpd/templates/NOTES.txt b/charts/molgenis-httpd/templates/NOTES.txt
similarity index 100%
rename from molgenis-httpd/templates/NOTES.txt
rename to charts/molgenis-httpd/templates/NOTES.txt
diff --git a/molgenis-httpd/templates/_helpers.tpl b/charts/molgenis-httpd/templates/_helpers.tpl
similarity index 100%
rename from molgenis-httpd/templates/_helpers.tpl
rename to charts/molgenis-httpd/templates/_helpers.tpl
diff --git a/molgenis-httpd/templates/deployment.yaml b/charts/molgenis-httpd/templates/deployment.yaml
similarity index 100%
rename from molgenis-httpd/templates/deployment.yaml
rename to charts/molgenis-httpd/templates/deployment.yaml
diff --git a/molgenis-httpd/templates/ingress.yaml b/charts/molgenis-httpd/templates/ingress.yaml
similarity index 100%
rename from molgenis-httpd/templates/ingress.yaml
rename to charts/molgenis-httpd/templates/ingress.yaml
diff --git a/molgenis-httpd/templates/service.yaml b/charts/molgenis-httpd/templates/service.yaml
similarity index 100%
rename from molgenis-httpd/templates/service.yaml
rename to charts/molgenis-httpd/templates/service.yaml
diff --git a/molgenis-httpd/values.yaml b/charts/molgenis-httpd/values.yaml
similarity index 98%
rename from molgenis-httpd/values.yaml
rename to charts/molgenis-httpd/values.yaml
index 04fffb6..b4246ba 100644
--- a/molgenis-httpd/values.yaml
+++ b/charts/molgenis-httpd/values.yaml
@@ -48,4 +48,4 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
\ No newline at end of file
+affinity: {}
diff --git a/molgenis-jenkins/Chart.yaml b/charts/molgenis-jenkins/Chart.yaml
similarity index 79%
rename from molgenis-jenkins/Chart.yaml
rename to charts/molgenis-jenkins/Chart.yaml
index a50005e..c77c7b4 100755
--- a/molgenis-jenkins/Chart.yaml
+++ b/charts/molgenis-jenkins/Chart.yaml
@@ -1,8 +1,11 @@
 name: molgenis-jenkins
 home: https://jenkins.io/
-version: 0.8.0
-appVersion: 2.121
+version: 0.8.1
+appVersion: 2.138.1
 description: Molgenis installation for the jenkins chart.
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg
+maintainers:
+- name: fdlk
+- name: sidohaakma
diff --git a/molgenis-jenkins/README.md b/charts/molgenis-jenkins/README.md
similarity index 100%
rename from molgenis-jenkins/README.md
rename to charts/molgenis-jenkins/README.md
diff --git a/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg b/charts/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg
similarity index 100%
rename from molgenis-jenkins/catalogIcon-molgenis-jenkins.svg
rename to charts/molgenis-jenkins/catalogIcon-molgenis-jenkins.svg
diff --git a/molgenis-jenkins/charts/jenkins-0.18.0.tgz b/charts/molgenis-jenkins/charts/jenkins-0.18.0.tgz
similarity index 100%
rename from molgenis-jenkins/charts/jenkins-0.18.0.tgz
rename to charts/molgenis-jenkins/charts/jenkins-0.18.0.tgz
diff --git a/molgenis-jenkins/requirements.lock b/charts/molgenis-jenkins/requirements.lock
similarity index 100%
rename from molgenis-jenkins/requirements.lock
rename to charts/molgenis-jenkins/requirements.lock
diff --git a/molgenis-jenkins/requirements.yaml b/charts/molgenis-jenkins/requirements.yaml
similarity index 100%
rename from molgenis-jenkins/requirements.yaml
rename to charts/molgenis-jenkins/requirements.yaml
diff --git a/molgenis-jenkins/resources/README.md b/charts/molgenis-jenkins/resources/README.md
similarity index 100%
rename from molgenis-jenkins/resources/README.md
rename to charts/molgenis-jenkins/resources/README.md
diff --git a/molgenis-jenkins/resources/jenkins-default-tiller-user-rolebinding.yaml b/charts/molgenis-jenkins/resources/jenkins-default-tiller-user-rolebinding.yaml
similarity index 100%
rename from molgenis-jenkins/resources/jenkins-default-tiller-user-rolebinding.yaml
rename to charts/molgenis-jenkins/resources/jenkins-default-tiller-user-rolebinding.yaml
diff --git a/molgenis-jenkins/resources/tiller-user-role.yaml b/charts/molgenis-jenkins/resources/tiller-user-role.yaml
similarity index 100%
rename from molgenis-jenkins/resources/tiller-user-role.yaml
rename to charts/molgenis-jenkins/resources/tiller-user-role.yaml
diff --git a/molgenis-jenkins/templates/config.tpl b/charts/molgenis-jenkins/templates/config.tpl
similarity index 100%
rename from molgenis-jenkins/templates/config.tpl
rename to charts/molgenis-jenkins/templates/config.tpl
diff --git a/molgenis-jenkins/templates/molgenis-jenkins-dockerhub-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-jenkins-dockerhub-secret.yaml
similarity index 100%
rename from molgenis-jenkins/templates/molgenis-jenkins-dockerhub-secret.yaml
rename to charts/molgenis-jenkins/templates/molgenis-jenkins-dockerhub-secret.yaml
diff --git a/molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml
similarity index 100%
rename from molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml
rename to charts/molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml
diff --git a/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml
similarity index 100%
rename from molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml
rename to charts/molgenis-jenkins/templates/molgenis-jenkins-gogs-secret.yaml
diff --git a/molgenis-jenkins/templates/molgenis-jenkins-registry-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-jenkins-registry-secret.yaml
similarity index 100%
rename from molgenis-jenkins/templates/molgenis-jenkins-registry-secret.yaml
rename to charts/molgenis-jenkins/templates/molgenis-jenkins-registry-secret.yaml
diff --git a/molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml b/charts/molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml
similarity index 100%
rename from molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml
rename to charts/molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml
diff --git a/molgenis-jenkins/values.yaml b/charts/molgenis-jenkins/values.yaml
similarity index 96%
rename from molgenis-jenkins/values.yaml
rename to charts/molgenis-jenkins/values.yaml
index 190ae98..583b472 100644
--- a/molgenis-jenkins/values.yaml
+++ b/charts/molgenis-jenkins/values.yaml
@@ -583,8 +583,42 @@ jenkins:
               cpu: "1"
               memory: "512Mi"
       NodeSelector: {}
+    helm:
+      Label: helm
+      NodeUsageMode: EXCLUSIVE
+      Containers:
+        chart-testing:
+          Image: "quay.io/helmpack/chart-testing"
+          ImageTag: v1.1.0
+          Command: cat
+          WorkingDir: /home/jenkins
+          TTY: true
+        alpine:
+          Image: "spotify/alpine"
+          Command: cat
+          WorkingDir: /home/jenkins
+          TTY: true
+        vault:
+          Image: "vault"
+          Command: cat
+          WorkingDir: /home/jenkins
+          TTY: true
+          EnvVars:
+            - type: Secret
+              key: VAULT_TOKEN
+              secretName: molgenis-pipeline-vault-secret
+              secretKey: token
+            - type: Secret
+              key: VAULT_SKIP_VERIFY
+              secretName: molgenis-pipeline-vault-secret
+              secretKey: skipVerify
+            - type: Secret
+              key: VAULT_ADDR
+              secretName: molgenis-pipeline-vault-secret
+              secretKey: addr
+      NodeSelector: {}
 
-#secret contains configuration for the kubernetes secrets that jenkins can access
+# secret contains configuration for the kubernetes secrets that jenkins can access
 secret:
   # vault configures the vault secret
   vault:
@@ -606,4 +640,4 @@ secret:
   # dockerHubPassword contains password for hub.docker.com
   dockerHub:
     user: molgenisci
-    password: xxxx
\ No newline at end of file
+    password: xxxx
diff --git a/molgenis-nexus/.helmignore b/charts/molgenis-nexus/.helmignore
similarity index 100%
rename from molgenis-nexus/.helmignore
rename to charts/molgenis-nexus/.helmignore
diff --git a/molgenis-nexus/Chart.yaml b/charts/molgenis-nexus/Chart.yaml
similarity index 60%
rename from molgenis-nexus/Chart.yaml
rename to charts/molgenis-nexus/Chart.yaml
index 0ced74d..e27e077 100644
--- a/molgenis-nexus/Chart.yaml
+++ b/charts/molgenis-nexus/Chart.yaml
@@ -5,4 +5,8 @@ name: molgenis-nexus
 version: 0.4.2
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
-icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-nexus/catalogIcon-molgenis-nexus.svg
\ No newline at end of file
+icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-nexus/catalogIcon-molgenis-nexus.svg
+home: https://www.sonatype.com/nexus-repository-oss
+maintainers:
+- name: sidohaakma
+- name: fdlk
diff --git a/molgenis-nexus/README.md b/charts/molgenis-nexus/README.md
similarity index 100%
rename from molgenis-nexus/README.md
rename to charts/molgenis-nexus/README.md
diff --git a/molgenis-nexus/catalogIcon-molgenis-nexus.svg b/charts/molgenis-nexus/catalogIcon-molgenis-nexus.svg
similarity index 100%
rename from molgenis-nexus/catalogIcon-molgenis-nexus.svg
rename to charts/molgenis-nexus/catalogIcon-molgenis-nexus.svg
diff --git a/molgenis-nexus/templates/_helpers.tpl b/charts/molgenis-nexus/templates/_helpers.tpl
similarity index 100%
rename from molgenis-nexus/templates/_helpers.tpl
rename to charts/molgenis-nexus/templates/_helpers.tpl
diff --git a/molgenis-nexus/templates/deployments/nexus-deployment.yaml b/charts/molgenis-nexus/templates/deployments/nexus-deployment.yaml
similarity index 100%
rename from molgenis-nexus/templates/deployments/nexus-deployment.yaml
rename to charts/molgenis-nexus/templates/deployments/nexus-deployment.yaml
diff --git a/molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml b/charts/molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml
similarity index 100%
rename from molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml
rename to charts/molgenis-nexus/templates/deployments/nexusProxy-deployment.yaml
diff --git a/molgenis-nexus/templates/ingress.yaml b/charts/molgenis-nexus/templates/ingress.yaml
similarity index 100%
rename from molgenis-nexus/templates/ingress.yaml
rename to charts/molgenis-nexus/templates/ingress.yaml
diff --git a/molgenis-nexus/templates/persistence/nexusPVC.yaml b/charts/molgenis-nexus/templates/persistence/nexusPVC.yaml
similarity index 100%
rename from molgenis-nexus/templates/persistence/nexusPVC.yaml
rename to charts/molgenis-nexus/templates/persistence/nexusPVC.yaml
diff --git a/molgenis-nexus/templates/services/nexus-service.yaml b/charts/molgenis-nexus/templates/services/nexus-service.yaml
similarity index 100%
rename from molgenis-nexus/templates/services/nexus-service.yaml
rename to charts/molgenis-nexus/templates/services/nexus-service.yaml
diff --git a/molgenis-nexus/templates/services/nexusProxy-service.yaml b/charts/molgenis-nexus/templates/services/nexusProxy-service.yaml
similarity index 100%
rename from molgenis-nexus/templates/services/nexusProxy-service.yaml
rename to charts/molgenis-nexus/templates/services/nexusProxy-service.yaml
diff --git a/molgenis-nexus/values.yaml b/charts/molgenis-nexus/values.yaml
similarity index 100%
rename from molgenis-nexus/values.yaml
rename to charts/molgenis-nexus/values.yaml
diff --git a/molgenis-opencpu/.helmignore b/charts/molgenis-opencpu/.helmignore
similarity index 100%
rename from molgenis-opencpu/.helmignore
rename to charts/molgenis-opencpu/.helmignore
diff --git a/molgenis-opencpu/Chart.yaml b/charts/molgenis-opencpu/Chart.yaml
similarity index 80%
rename from molgenis-opencpu/Chart.yaml
rename to charts/molgenis-opencpu/Chart.yaml
index 0ffe477..ba1d1e7 100644
--- a/molgenis-opencpu/Chart.yaml
+++ b/charts/molgenis-opencpu/Chart.yaml
@@ -5,4 +5,8 @@ name: molgenis-opencpu
 version: 0.1.1
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
-icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-opencpu/catalogIcon-molgenis-opencpu.svg
\ No newline at end of file
+icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-opencpu/catalogIcon-molgenis-opencpu.svg
+home: https://www.opencpu.org
+maintainers:
+- name: sidohaakma
+- name: fdlk
diff --git a/molgenis-opencpu/README.md b/charts/molgenis-opencpu/README.md
similarity index 100%
rename from molgenis-opencpu/README.md
rename to charts/molgenis-opencpu/README.md
diff --git a/molgenis-opencpu/catalog-molgenis-opencpu.svg b/charts/molgenis-opencpu/catalog-molgenis-opencpu.svg
similarity index 100%
rename from molgenis-opencpu/catalog-molgenis-opencpu.svg
rename to charts/molgenis-opencpu/catalog-molgenis-opencpu.svg
diff --git a/molgenis-opencpu/questions.yml b/charts/molgenis-opencpu/questions.yml
similarity index 100%
rename from molgenis-opencpu/questions.yml
rename to charts/molgenis-opencpu/questions.yml
diff --git a/molgenis-opencpu/templates/_helpers.tpl b/charts/molgenis-opencpu/templates/_helpers.tpl
similarity index 100%
rename from molgenis-opencpu/templates/_helpers.tpl
rename to charts/molgenis-opencpu/templates/_helpers.tpl
diff --git a/molgenis-opencpu/templates/deployment.yaml b/charts/molgenis-opencpu/templates/deployment.yaml
similarity index 100%
rename from molgenis-opencpu/templates/deployment.yaml
rename to charts/molgenis-opencpu/templates/deployment.yaml
diff --git a/molgenis-opencpu/templates/ingress.yaml b/charts/molgenis-opencpu/templates/ingress.yaml
similarity index 100%
rename from molgenis-opencpu/templates/ingress.yaml
rename to charts/molgenis-opencpu/templates/ingress.yaml
diff --git a/molgenis-opencpu/templates/service.yaml b/charts/molgenis-opencpu/templates/service.yaml
similarity index 100%
rename from molgenis-opencpu/templates/service.yaml
rename to charts/molgenis-opencpu/templates/service.yaml
diff --git a/molgenis-opencpu/values.yaml b/charts/molgenis-opencpu/values.yaml
similarity index 100%
rename from molgenis-opencpu/values.yaml
rename to charts/molgenis-opencpu/values.yaml
diff --git a/molgenis-vault/.helmignore b/charts/molgenis-vault/.helmignore
similarity index 100%
rename from molgenis-vault/.helmignore
rename to charts/molgenis-vault/.helmignore
diff --git a/molgenis-vault/Chart.yaml b/charts/molgenis-vault/Chart.yaml
similarity index 70%
rename from molgenis-vault/Chart.yaml
rename to charts/molgenis-vault/Chart.yaml
index f6b75e4..8ab4f68 100644
--- a/molgenis-vault/Chart.yaml
+++ b/charts/molgenis-vault/Chart.yaml
@@ -4,3 +4,7 @@ description: MOLGENIS vault
 name: molgenis-vault
 version: 0.1.1
 icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis-vault/catalogIcon-molgenis-vault.svg
+home: https://github.com/coreos/vault-operator
+maintainers:
+- name: fdlk
+- name: sidohaakma
diff --git a/molgenis-vault/README.md b/charts/molgenis-vault/README.md
similarity index 100%
rename from molgenis-vault/README.md
rename to charts/molgenis-vault/README.md
diff --git a/molgenis-vault/catalogIcon-molgenis-vault.svg b/charts/molgenis-vault/catalogIcon-molgenis-vault.svg
similarity index 100%
rename from molgenis-vault/catalogIcon-molgenis-vault.svg
rename to charts/molgenis-vault/catalogIcon-molgenis-vault.svg
diff --git a/molgenis-vault/charts/etcd-operator-0.8.0.tgz b/charts/molgenis-vault/charts/etcd-operator-0.8.0.tgz
similarity index 100%
rename from molgenis-vault/charts/etcd-operator-0.8.0.tgz
rename to charts/molgenis-vault/charts/etcd-operator-0.8.0.tgz
diff --git a/molgenis-vault/charts/vault-operator-0.1.1.tgz b/charts/molgenis-vault/charts/vault-operator-0.1.1.tgz
similarity index 100%
rename from molgenis-vault/charts/vault-operator-0.1.1.tgz
rename to charts/molgenis-vault/charts/vault-operator-0.1.1.tgz
diff --git a/molgenis-vault/requirements.lock b/charts/molgenis-vault/requirements.lock
similarity index 100%
rename from molgenis-vault/requirements.lock
rename to charts/molgenis-vault/requirements.lock
diff --git a/molgenis-vault/requirements.yaml b/charts/molgenis-vault/requirements.yaml
similarity index 100%
rename from molgenis-vault/requirements.yaml
rename to charts/molgenis-vault/requirements.yaml
diff --git a/molgenis-vault/resources/restore.yaml b/charts/molgenis-vault/resources/restore.yaml
similarity index 100%
rename from molgenis-vault/resources/restore.yaml
rename to charts/molgenis-vault/resources/restore.yaml
diff --git a/molgenis-vault/resources/vault.yaml b/charts/molgenis-vault/resources/vault.yaml
similarity index 100%
rename from molgenis-vault/resources/vault.yaml
rename to charts/molgenis-vault/resources/vault.yaml
diff --git a/molgenis-vault/templates/NOTES.txt b/charts/molgenis-vault/templates/NOTES.txt
similarity index 100%
rename from molgenis-vault/templates/NOTES.txt
rename to charts/molgenis-vault/templates/NOTES.txt
diff --git a/molgenis-vault/templates/_helpers.tpl b/charts/molgenis-vault/templates/_helpers.tpl
similarity index 100%
rename from molgenis-vault/templates/_helpers.tpl
rename to charts/molgenis-vault/templates/_helpers.tpl
diff --git a/molgenis-vault/templates/abs-secret.yaml b/charts/molgenis-vault/templates/abs-secret.yaml
similarity index 100%
rename from molgenis-vault/templates/abs-secret.yaml
rename to charts/molgenis-vault/templates/abs-secret.yaml
diff --git a/molgenis-vault/templates/backup-configmap.yaml b/charts/molgenis-vault/templates/backup-configmap.yaml
similarity index 100%
rename from molgenis-vault/templates/backup-configmap.yaml
rename to charts/molgenis-vault/templates/backup-configmap.yaml
diff --git a/molgenis-vault/templates/backup-cronjob.yaml b/charts/molgenis-vault/templates/backup-cronjob.yaml
similarity index 100%
rename from molgenis-vault/templates/backup-cronjob.yaml
rename to charts/molgenis-vault/templates/backup-cronjob.yaml
diff --git a/molgenis-vault/templates/ui-ingress.yaml b/charts/molgenis-vault/templates/ui-ingress.yaml
similarity index 100%
rename from molgenis-vault/templates/ui-ingress.yaml
rename to charts/molgenis-vault/templates/ui-ingress.yaml
diff --git a/molgenis-vault/templates/ui-service.yaml b/charts/molgenis-vault/templates/ui-service.yaml
similarity index 100%
rename from molgenis-vault/templates/ui-service.yaml
rename to charts/molgenis-vault/templates/ui-service.yaml
diff --git a/molgenis-vault/templates/vault-ui-deployment.yaml b/charts/molgenis-vault/templates/vault-ui-deployment.yaml
similarity index 100%
rename from molgenis-vault/templates/vault-ui-deployment.yaml
rename to charts/molgenis-vault/templates/vault-ui-deployment.yaml
diff --git a/molgenis-vault/values.yaml b/charts/molgenis-vault/values.yaml
similarity index 97%
rename from molgenis-vault/values.yaml
rename to charts/molgenis-vault/values.yaml
index aaca8f3..2dd48f5 100644
--- a/molgenis-vault/values.yaml
+++ b/charts/molgenis-vault/values.yaml
@@ -70,10 +70,10 @@ ui:
     # limits:
     #  cpu: 100m
     #  memory: 128Mi
-    #requests:
+    # requests:
     #  cpu: 100m
     #  memory: 128Mi
   nodeSelector: {}
   vault:
     auth: GITHUB
-    url: https://vault.vault-operator:8200
\ No newline at end of file
+    url: https://vault.vault-operator:8200
diff --git a/molgenis/Chart.yaml b/charts/molgenis/Chart.yaml
similarity index 67%
rename from molgenis/Chart.yaml
rename to charts/molgenis/Chart.yaml
index cde7e05..3999c48 100644
--- a/molgenis/Chart.yaml
+++ b/charts/molgenis/Chart.yaml
@@ -5,4 +5,8 @@ name: molgenis
 version: 0.4.3
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git
-icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis/catalogIcon-molgenis.svg
\ No newline at end of file
+icon: https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm/raw/master/molgenis/catalogIcon-molgenis.svg
+home: http://molgenis.org
+maintainers:
+- name: sidohaakma
+- name: fdlk
diff --git a/molgenis/README.md b/charts/molgenis/README.md
similarity index 100%
rename from molgenis/README.md
rename to charts/molgenis/README.md
diff --git a/molgenis/catalogIcon-molgenis.svg b/charts/molgenis/catalogIcon-molgenis.svg
similarity index 100%
rename from molgenis/catalogIcon-molgenis.svg
rename to charts/molgenis/catalogIcon-molgenis.svg
diff --git a/molgenis/questions.yml b/charts/molgenis/questions.yml
similarity index 100%
rename from molgenis/questions.yml
rename to charts/molgenis/questions.yml
diff --git a/molgenis/templates/NOTES.txt b/charts/molgenis/templates/NOTES.txt
similarity index 100%
rename from molgenis/templates/NOTES.txt
rename to charts/molgenis/templates/NOTES.txt
diff --git a/molgenis/templates/_helpers.tpl b/charts/molgenis/templates/_helpers.tpl
similarity index 100%
rename from molgenis/templates/_helpers.tpl
rename to charts/molgenis/templates/_helpers.tpl
diff --git a/molgenis/templates/deployment.yaml b/charts/molgenis/templates/deployment.yaml
similarity index 100%
rename from molgenis/templates/deployment.yaml
rename to charts/molgenis/templates/deployment.yaml
diff --git a/molgenis/templates/ingress.yaml b/charts/molgenis/templates/ingress.yaml
similarity index 100%
rename from molgenis/templates/ingress.yaml
rename to charts/molgenis/templates/ingress.yaml
diff --git a/molgenis/templates/persistence/elasticsearchPVC.yaml b/charts/molgenis/templates/persistence/elasticsearchPVC.yaml
similarity index 100%
rename from molgenis/templates/persistence/elasticsearchPVC.yaml
rename to charts/molgenis/templates/persistence/elasticsearchPVC.yaml
diff --git a/molgenis/templates/persistence/molgenisPVC.yaml b/charts/molgenis/templates/persistence/molgenisPVC.yaml
similarity index 100%
rename from molgenis/templates/persistence/molgenisPVC.yaml
rename to charts/molgenis/templates/persistence/molgenisPVC.yaml
diff --git a/molgenis/templates/persistence/postgresPVC.yaml b/charts/molgenis/templates/persistence/postgresPVC.yaml
similarity index 100%
rename from molgenis/templates/persistence/postgresPVC.yaml
rename to charts/molgenis/templates/persistence/postgresPVC.yaml
diff --git a/molgenis/templates/service.yaml b/charts/molgenis/templates/service.yaml
similarity index 100%
rename from molgenis/templates/service.yaml
rename to charts/molgenis/templates/service.yaml
diff --git a/molgenis/values.yaml b/charts/molgenis/values.yaml
similarity index 94%
rename from molgenis/values.yaml
rename to charts/molgenis/values.yaml
index c9fa30c..e9ddb99 100644
--- a/molgenis/values.yaml
+++ b/charts/molgenis/values.yaml
@@ -64,12 +64,12 @@ elasticsearch:
   javaOpts: "-Xms1g -Xmx1g"
   clusterName: molgenis
   resources:
-   limits:
-    cpu: 2
-    memory: 3Gi
-   requests:
-    cpu: 100m
-    memory: 1Gi
+    limits:
+      cpu: 2
+      memory: 3Gi
+    requests:
+      cpu: 100m
+      memory: 1Gi
   persistence:
     claim: elasticsearch-nfs-claim
     size: 5Gi