diff --git a/maas/README.md b/maas/README.md
index 427e5e2886..d52af86acb 100644
--- a/maas/README.md
+++ b/maas/README.md
@@ -2,7 +2,6 @@
 
 This chart installs a working version of MaaS on kubernetes.
 
-
 ### Quickstart
 
 To deploy your MaaS chart:
diff --git a/maas/templates/deploy-rack.yaml b/maas/templates/deploy-rack.yaml
new file mode 100644
index 0000000000..bd89d6b935
--- /dev/null
+++ b/maas/templates/deploy-rack.yaml
@@ -0,0 +1,19 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: maas-rack
+spec:
+  template:
+    metadata:
+      labels:
+        app: maas-rack-controller
+    spec:
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      hostNetwork: true
+      containers:
+      - name: maas-rack
+        image: {{ .Values.images.maas_rack }}
+        imagePullPolicy: Always
+        securityContext:
+          privileged: true
diff --git a/maas/templates/deploy-region.yaml b/maas/templates/deploy-region.yaml
new file mode 100644
index 0000000000..ed0e3f7613
--- /dev/null
+++ b/maas/templates/deploy-region.yaml
@@ -0,0 +1,20 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: maas-region
+spec:
+  template:
+    metadata:
+      labels:
+        app: maas-region
+    spec:
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      containers:
+      - name: maas-region
+        image: {{ .Values.images.maas_region }}
+        imagePullPolicy: Always
+        ports:
+        - containerPort: {{ .Values.network.port.region_container }}
+        securityContext:
+          privileged: true
diff --git a/maas/templates/deployment.yaml b/maas/templates/deployment.yaml
deleted file mode 100644
index f41b4595fe..0000000000
--- a/maas/templates/deployment.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: maas-region
-spec:
-  template:
-    metadata:
-      labels:
-        app: maas-region
-    spec:
-      containers:
-      - name: maas-region
-        image: {{ .Values.image_maas_region }}
-        imagePullPolicy: Always
-        ports:
-        - containerPort: {{ .Values.maas_region_container_port }}
-        securityContext:
-          privileged: true
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: maas-rack
-spec:
-  template:
-    metadata:
-      labels:
-        app: maas-rack-controller
-    spec:
-      hostNetwork: true
-      containers:
-      - name: maas-rack
-        image: {{ .Values.image_maas_rack }}
-        imagePullPolicy: Always
-        ports:
-        - containerPort: {{ .Values.maas_rack_container_port }}
-        securityContext:
-          privileged: true
diff --git a/maas/templates/service.yaml b/maas/templates/service.yaml
index 38727e7be4..2be9c7adda 100644
--- a/maas/templates/service.yaml
+++ b/maas/templates/service.yaml
@@ -6,12 +6,12 @@ metadata:
     app: maas-region-ui
 spec:
   ports:
-  - port: {{ .Values.service_gui_port }}
-    targetPort: {{ .Values.service_gui_target_port }}
+  - port: {{ .Values.network.port.service_gui }}
+    targetPort: {{ .Values.network.port.service_gui_target }}
     protocol: TCP
     name: gui
-  - port: {{ .Values.service_proxy_port }}
-    targetPort: {{ .Values.service_proxy_target_port }}
+  - port: {{ .Values.network.port.service_proxy }}
+    targetPort: {{ .Values.network.port.service_proxy_target }}
     protocol: TCP
     name: proxy
   selector:
diff --git a/maas/values.yaml b/maas/values.yaml
index f7266d4cb0..f643a2592d 100644
--- a/maas/values.yaml
+++ b/maas/values.yaml
@@ -2,13 +2,18 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-image_maas_region: quay.io/attcomdev/maas-region:1.0.1
-image_maas_rack: quay.io/attcomdev/maas-rack:1.0.1
+images:
+  maas_region: quay.io/attcomdev/maas-region:1.0.1
+  maas_rack: quay.io/attcomdev/maas-rack:1.0.1
 
-maas_region_container_port: 80
-maas_rack_container_port: 80
+labels:
+  node_selector_key: openstack-control-plane
+  node_selector_value: enabled
 
-service_gui_port: 80
-service_gui_target_port: 80
-service_proxy_port: 8000
-service_proxy_target_port: 8000
+network:
+  port:
+    region_container: 80
+    service_gui: 80
+    service_gui_target: 80
+    service_proxy: 8000
+    service_proxy_target: 8000