diff --git a/nexus/v1.0.0/Chart.yaml b/nexus/v1.0.0/Chart.yaml
index cc2a6d2..8afa30f 100644
--- a/nexus/v1.0.0/Chart.yaml
+++ b/nexus/v1.0.0/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v1
 appVersion: "1.0"
 description: Nexus stack for MOLGENIS
 name: nexus
-version: 0.1.0
+version: 0.1.1
 icon: https://github.com/sidohaakma/molgenis-docker-helm/blob/master/nexus/catalogIcon-molgenis-nexus.svg
\ No newline at end of file
diff --git a/nexus/v1.0.0/templates/deployments/httpd-deployment.yaml b/nexus/v1.0.0/templates/deployments/httpd-deployment.yaml
new file mode 100644
index 0000000..50fc676
--- /dev/null
+++ b/nexus/v1.0.0/templates/deployments/httpd-deployment.yaml
@@ -0,0 +1,33 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  creationTimestamp: null
+  name: {{ .Values.httpd.name }}
+  labels:
+    app: {{ .Values.httpd.name }}
+    environment: {{ .Values.environment }}
+spec:
+  replicas: 1
+  strategy: {}
+  selector:
+    matchLabels:
+      app: {{ .Values.httpd.selector }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.httpd.name }}
+      creationTimestamp: null
+    spec:
+      restartPolicy: {{ .Values.httpd.restartPolicy }}
+      containers:
+      - name: {{ .Values.httpd.name }}
+        image: "{{ .Values.httpd.image.repository }}:{{ .Values.httpd.image.tag }}"
+        imagePullPolicy: {{ .Values.httpd.image.pullPolicy }}
+        env:
+        - name: PROXY_SERVICE
+          value: "{{ .Values.nexus.name }}:{{ .Values.nexus.port.ui }},{{ .Values.nexus.name }}:{{ .Values.nexus.port.docker }}:v2"
+        - name: SERVER_NAME
+          value: registry.molgenis.org
+        ports:
+        - containerPort: {{ .Values.httpd.port }}
+        resources: {}
\ No newline at end of file
diff --git a/nexus/v1.0.0/templates/deployments/nexus-deployment.yaml b/nexus/v1.0.0/templates/deployments/nexus-deployment.yaml
new file mode 100644
index 0000000..55988cd
--- /dev/null
+++ b/nexus/v1.0.0/templates/deployments/nexus-deployment.yaml
@@ -0,0 +1,28 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  creationTimestamp: null
+  name: {{ .Values.nexus.name }}
+  labels:
+    app: {{ .Values.nexus.name }}
+    environment: {{ .Values.environment }}
+spec:
+  replicas: 1
+  strategy: {}
+  selector:
+    matchLabels:
+      app: {{ .Values.nexus.selector }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.nexus.name }}
+      creationTimestamp: null
+    spec:
+      restartPolicy: {{ .Values.nexus.restartPolicy }}
+      containers:
+      - name: {{ .Values.nexus.name }}
+        image: "{{ .Values.nexus.image.repository }}:{{ .Values.nexus.image.tag }}"
+        imagePullPolicy: {{ .Values.nexus.image.pullPolicy }}
+        ports:
+        - containerPort: {{ .Values.nexus.port.ui }}
+        - containerPort: {{ .Values.nexus.port.docker }}
diff --git a/nexus/v1.0.0/templates/httpd-deployment.yaml b/nexus/v1.0.0/templates/httpd-deployment.yaml
deleted file mode 100644
index 6fd8226..0000000
--- a/nexus/v1.0.0/templates/httpd-deployment.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  creationTimestamp: null
-  name: httpd
-  labels:
-    app: nexus
-    environment: production
-spec:
-  replicas: 1
-  strategy: {}
-  selector:
-    matchLabels:
-      app: httpd
-  template:
-    metadata:
-      labels:
-        app: httpd
-      creationTimestamp: null
-    spec:
-      restartPolicy: Always
-      containers:
-      - name: httpd
-        image: registry.webhosting.rug.nl/molgenis/httpd:lts
-        env:
-        - name: PROXY_SERVICE
-          value: nexus:8081,nexus:5000:v2
-        - name: SERVER_NAME
-          value: registry.molgenis.org
-        ports:
-        - containerPort: 80
-        resources: {}
\ No newline at end of file
diff --git a/nexus/v1.0.0/templates/httpd-service.yaml b/nexus/v1.0.0/templates/httpd-service.yaml
deleted file mode 100644
index 0a99e66..0000000
--- a/nexus/v1.0.0/templates/httpd-service.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: httpd
-  labels:
-    app: httpd
-spec:
-  type: NodePort
-  ports:
-  - name: httpd
-    port: 80
-  selector:
-    app: httpd
diff --git a/nexus/v1.0.0/templates/nexus-deployment.yaml b/nexus/v1.0.0/templates/nexus-deployment.yaml
deleted file mode 100644
index 53cd3e2..0000000
--- a/nexus/v1.0.0/templates/nexus-deployment.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  creationTimestamp: null
-  name: nexus
-  labels:
-    app: nexus
-    environment: production
-spec:
-  replicas: 1
-  strategy: {}
-  selector:
-    matchLabels:
-      app: nexus
-  template:
-    metadata:
-      labels:
-        app: nexus
-      creationTimestamp: null
-    spec:
-      restartPolicy: Always
-      containers:
-      - name: nexus
-        image: sonatype/nexus3:latest
-        ports:
-        - containerPort: 8081
-        - containerPort: 5000
diff --git a/nexus/v1.0.0/templates/nexus-service.yaml b/nexus/v1.0.0/templates/nexus-service.yaml
deleted file mode 100644
index 770c4cc..0000000
--- a/nexus/v1.0.0/templates/nexus-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: nexus
-  labels:
-    app: nexus
-spec:
-  type: ClusterIP
-  ports:
-  - name: ui
-    port: 8081
-  - name: docker
-    port: 5000
-  selector:
-    app: nexus
diff --git a/nexus/v1.0.0/templates/services/httpd-service.yaml b/nexus/v1.0.0/templates/services/httpd-service.yaml
new file mode 100644
index 0000000..5b3d939
--- /dev/null
+++ b/nexus/v1.0.0/templates/services/httpd-service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.httpd.name }}
+  labels:
+    app: {{ .Values.httpd.name }}
+spec:
+  type: NodePort
+  ports:
+  - name: {{ .Values.httpd.name }}
+    port: {{ .Values.httpd.port }}
+  selector:
+    app: {{ .Values.httpd.selector }}
diff --git a/nexus/v1.0.0/templates/services/nexus-service.yaml b/nexus/v1.0.0/templates/services/nexus-service.yaml
new file mode 100644
index 0000000..bc0fda7
--- /dev/null
+++ b/nexus/v1.0.0/templates/services/nexus-service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.nexus.name }}
+  labels:
+    app: {{ .Values.nexus.name }}
+spec:
+  type: ClusterIP
+  ports:
+  - name: ui
+    port: {{ .Values.nexus.port.ui }}
+  - name: docker
+    port: {{ .Values.nexus.port.docker }}
+  selector:
+    app: {{ .Values.nexus.selector }}
diff --git a/nexus/v1.0.0/values.yaml b/nexus/v1.0.0/values.yaml
index 6e966a9..c5b4b12 100644
--- a/nexus/v1.0.0/values.yaml
+++ b/nexus/v1.0.0/values.yaml
@@ -4,15 +4,34 @@
 
 replicaCount: 1
 
-image:
-  repository: sonatype/nexus3
-  tag: latest
-  pullPolicy: Always
+environment: production
 
 service:
   type: ClusterIP
   port: 80
 
+nexus:
+  name: nexus
+  selector: nexus
+  restartPolicy: Always
+  image:
+    repository: sonatype/nexus3
+    tag: latest
+    pullPolicy: Always
+  port:
+    docker: 5000
+    ui: 8081
+
+httpd:
+  name: httpd
+  selector: httpd
+  restartPolicy: Always
+  image:
+    repository: registry.webhosting.rug.nl/molgenis/httpd
+    tag: lts
+    pullPolicy: Always
+  port: 80
+
 ingress:
   enabled: true
   annotations: {}