diff --git a/services/Syncthing/_namespace-Syncthing.yml b/services/Syncthing/_namespace-Syncthing.yml
new file mode 100644
index 0000000..399f956
--- /dev/null
+++ b/services/Syncthing/_namespace-Syncthing.yml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: syncthing
diff --git a/services/Syncthing/deploy-Syncthing.yml b/services/Syncthing/deployment-Syncthing.yml
similarity index 52%
rename from services/Syncthing/deploy-Syncthing.yml
rename to services/Syncthing/deployment-Syncthing.yml
index d2c3be4..707d6af 100644
--- a/services/Syncthing/deploy-Syncthing.yml
+++ b/services/Syncthing/deployment-Syncthing.yml
@@ -1,30 +1,10 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: syncthing
-spec:
-  ports:
-    - protocol: TCP
-      name: web
-      port: 8384
-    - protocol: TCP
-      name: tcp-file-xfer
-      port: 22000
-    - protocol: UDP
-      name: quic-file-xfer
-      port: 22000
-    - protocol: UDP
-      name: discovery
-      port: 21027
-  selector:
-    app: syncthing
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
     app: syncthing
   name: syncthing
+  namespace: syncthing
 spec:
   replicas: 1
   strategy:
@@ -64,34 +44,3 @@ spec:
       - name: longhorn-syncthing-data
         persistentVolumeClaim:
           claimName: longhorn-syncthing-data
----
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: syncthing
-spec:
-  entryPoints:
-    - websecure
-  routes:
-  - match: Host(`sync.spamasaurus.com`)
-    kind: Rule
-    services:
-    - name: syncthing
-      port: 8384
-    middlewares:
-    - name: 2fa-authentication@file
-    - name: security-headers@file
-    - name: compression@file
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: longhorn-syncthing-data
-  namespace: default
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 5Gi
diff --git a/services/Syncthing/ingressRoute-Syncthing.yml b/services/Syncthing/ingressRoute-Syncthing.yml
new file mode 100644
index 0000000..05563df
--- /dev/null
+++ b/services/Syncthing/ingressRoute-Syncthing.yml
@@ -0,0 +1,18 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: syncthing
+  namespace: syncthing
+spec:
+  entryPoints:
+    - websecure
+  routes:
+  - match: Host(`sync.spamasaurus.com`)
+    kind: Rule
+    services:
+    - name: syncthing
+      port: 8384
+    middlewares:
+    - name: 2fa-authentication@file
+    - name: security-headers@file
+    - name: compression@file
diff --git a/services/Syncthing/persistentVolumeClaim-Syncthing.yml b/services/Syncthing/persistentVolumeClaim-Syncthing.yml
new file mode 100644
index 0000000..0529cd7
--- /dev/null
+++ b/services/Syncthing/persistentVolumeClaim-Syncthing.yml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: longhorn-syncthing-data
+  namespace: syncthing
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: longhorn
+  resources:
+    requests:
+      storage: 5Gi
diff --git a/services/Syncthing/service-Syncthing.yml b/services/Syncthing/service-Syncthing.yml
new file mode 100644
index 0000000..584ee5a
--- /dev/null
+++ b/services/Syncthing/service-Syncthing.yml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: syncthing
+  namespace: syncthing
+spec:
+  ports:
+    - protocol: TCP
+      name: web
+      port: 8384
+    - protocol: TCP
+      name: tcp-file-xfer
+      port: 22000
+    - protocol: UDP
+      name: quic-file-xfer
+      port: 22000
+    - protocol: UDP
+      name: discovery
+      port: 21027
+  selector:
+    app: syncthing