diff --git a/httpd/v1.0.0/templates/service.yaml b/httpd/v1.0.0/templates/service.yaml
index 18a3380..3a7f457 100644
--- a/httpd/v1.0.0/templates/service.yaml
+++ b/httpd/v1.0.0/templates/service.yaml
@@ -8,9 +8,9 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.httpd.type }}
   ports:
-    - port: {{ .Values.service.port }}
+    - port: {{ .Values.httpd.port }}
       targetPort: http
       protocol: TCP
       name: http
diff --git a/httpd/v1.0.0/values.yaml b/httpd/v1.0.0/values.yaml
index f26e198..650186a 100644
--- a/httpd/v1.0.0/values.yaml
+++ b/httpd/v1.0.0/values.yaml
@@ -9,16 +9,14 @@ image:
   tag: lts
   pullPolicy: IfNotPresent
 
-molgenisUsername: molgenis
-molgenisEmail: admin@molgenis.org
-
-service:
+httpd:
   type: ClusterIP
   port: 80
-
-httpd:
   proxy: httpd:80:/
   hostname: test.molgenis.org
+  volume:
+    username: molgenis
+    email: admin@molgenis.org
 
 ingress:
   enabled: false
diff --git a/nexus/v1.0.0/templates/services/httpd-service.yaml b/nexus/v1.0.0/templates/services/httpd-service.yaml
index 18a3380..3a7f457 100644
--- a/nexus/v1.0.0/templates/services/httpd-service.yaml
+++ b/nexus/v1.0.0/templates/services/httpd-service.yaml
@@ -8,9 +8,9 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.httpd.type }}
   ports:
-    - port: {{ .Values.service.port }}
+    - port: {{ .Values.httpd.port }}
       targetPort: http
       protocol: TCP
       name: http
diff --git a/nexus/v1.0.0/values.yaml b/nexus/v1.0.0/values.yaml
index 865732a..ca02061 100644
--- a/nexus/v1.0.0/values.yaml
+++ b/nexus/v1.0.0/values.yaml
@@ -9,7 +9,13 @@ image:
   tag: stable
   pullPolicy: IfNotPresent
 
-service:
+httpd:
+  name: httpd
+  type: ClusterIP
+  port: 80
+  proxy: httpd:80:/
+
+nexus:
   name: nexus
   type: ClusterIP