diff --git a/jenkins/.helmignore b/charts/jenkins/v1.0.0/.helmignore
similarity index 100%
rename from jenkins/.helmignore
rename to charts/jenkins/v1.0.0/.helmignore
diff --git a/jenkins/Chart.yaml b/charts/jenkins/v1.0.0/Chart.yaml
similarity index 100%
rename from jenkins/Chart.yaml
rename to charts/jenkins/v1.0.0/Chart.yaml
diff --git a/jenkins/catalogIcon-molgenis-jenkins.svg b/charts/jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg
similarity index 100%
rename from jenkins/catalogIcon-molgenis-jenkins.svg
rename to charts/jenkins/v1.0.0/catalogIcon-molgenis-jenkins.svg
diff --git a/jenkins/templates/NOTES.txt b/charts/jenkins/v1.0.0/templates/NOTES.txt
similarity index 100%
rename from jenkins/templates/NOTES.txt
rename to charts/jenkins/v1.0.0/templates/NOTES.txt
diff --git a/jenkins/templates/_helpers.tpl b/charts/jenkins/v1.0.0/templates/_helpers.tpl
similarity index 100%
rename from jenkins/templates/_helpers.tpl
rename to charts/jenkins/v1.0.0/templates/_helpers.tpl
diff --git a/jenkins/templates/deployment.yaml b/charts/jenkins/v1.0.0/templates/deployment.yaml
similarity index 97%
rename from jenkins/templates/deployment.yaml
rename to charts/jenkins/v1.0.0/templates/deployment.yaml
index 619efce..fbcd510 100644
--- a/jenkins/templates/deployment.yaml
+++ b/charts/jenkins/v1.0.0/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
-              containerPort: 80
+              containerPort: 8080
               protocol: TCP
           livenessProbe:
             httpGet:
diff --git a/jenkins/templates/ingress.yaml b/charts/jenkins/v1.0.0/templates/ingress.yaml
similarity index 100%
rename from jenkins/templates/ingress.yaml
rename to charts/jenkins/v1.0.0/templates/ingress.yaml
diff --git a/jenkins/templates/service.yaml b/charts/jenkins/v1.0.0/templates/service.yaml
similarity index 100%
rename from jenkins/templates/service.yaml
rename to charts/jenkins/v1.0.0/templates/service.yaml
diff --git a/jenkins/values.yaml b/charts/jenkins/v1.0.0/values.yaml
similarity index 97%
rename from jenkins/values.yaml
rename to charts/jenkins/v1.0.0/values.yaml
index f1568aa..fb0eb38 100644
--- a/jenkins/values.yaml
+++ b/charts/jenkins/v1.0.0/values.yaml
@@ -20,7 +20,7 @@ ingress:
     # kubernetes.io/tls-acme: "true"
   path: /
   hosts:
-    - chart-example.local
+    - registry.molgenis.local
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:
diff --git a/nexus/.helmignore b/charts/nexus/v1.0.0/.helmignore
similarity index 100%
rename from nexus/.helmignore
rename to charts/nexus/v1.0.0/.helmignore
diff --git a/nexus/Chart.yaml b/charts/nexus/v1.0.0/Chart.yaml
similarity index 100%
rename from nexus/Chart.yaml
rename to charts/nexus/v1.0.0/Chart.yaml
diff --git a/nexus/catalogIcon-molgenis-nexus.svg b/charts/nexus/v1.0.0/catalogIcon-molgenis-nexus.svg
similarity index 100%
rename from nexus/catalogIcon-molgenis-nexus.svg
rename to charts/nexus/v1.0.0/catalogIcon-molgenis-nexus.svg
diff --git a/nexus/templates/NOTES.txt b/charts/nexus/v1.0.0/templates/NOTES.txt
similarity index 100%
rename from nexus/templates/NOTES.txt
rename to charts/nexus/v1.0.0/templates/NOTES.txt
diff --git a/nexus/templates/_helpers.tpl b/charts/nexus/v1.0.0/templates/_helpers.tpl
similarity index 100%
rename from nexus/templates/_helpers.tpl
rename to charts/nexus/v1.0.0/templates/_helpers.tpl
diff --git a/nexus/templates/deployment.yaml b/charts/nexus/v1.0.0/templates/deployment.yaml
similarity index 100%
rename from nexus/templates/deployment.yaml
rename to charts/nexus/v1.0.0/templates/deployment.yaml
diff --git a/nexus/templates/ingress.yaml b/charts/nexus/v1.0.0/templates/ingress.yaml
similarity index 100%
rename from nexus/templates/ingress.yaml
rename to charts/nexus/v1.0.0/templates/ingress.yaml
diff --git a/nexus/templates/service.yaml b/charts/nexus/v1.0.0/templates/service.yaml
similarity index 100%
rename from nexus/templates/service.yaml
rename to charts/nexus/v1.0.0/templates/service.yaml
diff --git a/nexus/values.yaml b/charts/nexus/v1.0.0/values.yaml
similarity index 100%
rename from nexus/values.yaml
rename to charts/nexus/v1.0.0/values.yaml