diff --git a/workloads/hass.yml b/workloads/hass/deployment.yml
similarity index 74%
rename from workloads/hass.yml
rename to workloads/hass/deployment.yml
index 5e3511d..cf952b2 100644
--- a/workloads/hass.yml
+++ b/workloads/hass/deployment.yml
@@ -49,31 +49,3 @@ spec:
         hostPath:
           path: /etc/localtime
           type: File
-
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: hass
-spec:
-  selector:
-    app: hass
-  ports:
-  - protocol: TCP
-    port: 80
-    targetPort: hass-http
-    name: http
----
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: hass
-spec:
-  rules:
-  - host: hass.shoup.io
-    http:
-      paths:
-      - backend:
-          serviceName: hass
-          servicePort: http
-        path: /
diff --git a/workloads/hass/service.yml b/workloads/hass/service.yml
new file mode 100644
index 0000000..61c69ec
--- /dev/null
+++ b/workloads/hass/service.yml
@@ -0,0 +1,26 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: hass
+spec:
+  selector:
+    app: hass
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: hass-http
+    name: http
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: hass
+spec:
+  rules:
+  - host: hass.shoup.io
+    http:
+      paths:
+      - backend:
+          serviceName: hass
+          servicePort: http
+        path: /
diff --git a/workloads/kubeseal.yml b/workloads/kubeseal/kubeseal.yml
similarity index 100%
rename from workloads/kubeseal.yml
rename to workloads/kubeseal/kubeseal.yml
diff --git a/workloads/nip-io/config.yml b/workloads/nip-io/config.yml
new file mode 100644
index 0000000..cfc1305
--- /dev/null
+++ b/workloads/nip-io/config.yml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nip-io
+data:
+  backend.conf: |
+    [main]
+    domain=lcl.home.shoup.io
+    ttl=432000
+    ipaddress=127.0.0.1
+    [soa]
+    id=1
+    hostmaster=hostmaster@lcl.home.shoup.io
+    ns=ns1.lcl.home.shoup.io
+    [nameservers]
+    ns1.lcl.home.shoup.io=127.0.0.1
+    ns2.lcl.home.shoup.io=127.0.0.1
+    [blacklist]
diff --git a/workloads/nip-io.yml b/workloads/nip-io/deployment.yml
similarity index 50%
rename from workloads/nip-io.yml
rename to workloads/nip-io/deployment.yml
index add13bb..c053421 100644
--- a/workloads/nip-io.yml
+++ b/workloads/nip-io/deployment.yml
@@ -1,23 +1,3 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nip-io
-data:
-  backend.conf: |
-    [main]
-    domain=lcl.home.shoup.io
-    ttl=432000
-    ipaddress=127.0.0.1
-    [soa]
-    id=1
-    hostmaster=hostmaster@lcl.home.shoup.io
-    ns=ns1.lcl.home.shoup.io
-    [nameservers]
-    ns1.lcl.home.shoup.io=127.0.0.1
-    ns2.lcl.home.shoup.io=127.0.0.1
-    [blacklist]
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -51,23 +31,3 @@ spec:
       - name: config
         configMap:
           name: nip-io
----
-kind: Service
-apiVersion: v1
-metadata:
-  name: nip-io
-spec:
-  type: NodePort
-  selector:
-    app: nip-io
-  ports:
-  - name: dns-tcp
-    protocol: TCP
-    port: 53
-    nodePort: 31053
-    targetPort: dns-tcp
-  - name: dns-udp
-    protocol: UDP
-    port: 53
-    nodePort: 31053
-    targetPort: dns-udp
diff --git a/workloads/nip-io/service.yml b/workloads/nip-io/service.yml
new file mode 100644
index 0000000..313ecf8
--- /dev/null
+++ b/workloads/nip-io/service.yml
@@ -0,0 +1,19 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: nip-io
+spec:
+  type: NodePort
+  selector:
+    app: nip-io
+  ports:
+  - name: dns-tcp
+    protocol: TCP
+    port: 53
+    nodePort: 31053
+    targetPort: dns-tcp
+  - name: dns-udp
+    protocol: UDP
+    port: 53
+    nodePort: 31053
+    targetPort: dns-udp