diff --git a/services/DroneCI/deploy-DroneCI.yml b/services/DroneCI/deploy-DroneCI.yml
index 91d01c6..b161398 100644
--- a/services/DroneCI/deploy-DroneCI.yml
+++ b/services/DroneCI/deploy-DroneCI.yml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: drone
+  namespace: drone
 spec:
   ports:
     - protocol: TCP
@@ -14,6 +15,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: drone
+  namespace: drone
   labels:
     app: drone
 spec:
@@ -83,6 +85,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: drone
+  namespace: drone
   labels:
     app: drone
 ---
@@ -90,6 +93,7 @@ apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
   name: drone
+  namespace: drone
 spec:
   entryPoints:
     - websecure
@@ -116,17 +120,17 @@ spec:
   flexVolume:
     driver: mount/smb
     secretRef:
-      name: smb-secret
+      name: flexvolsmb-credentials
     options:
-      opts: domain=bessems.eu,file_mode=0777,dir_mode=0777,iocharset=utf8,nobrl
-      server: 192.168.11.225
+      opts: file_mode=0777,dir_mode=0777,iocharset=utf8,nobrl
+      server: 192.168.154.225
       share: /K3s.Volumes/drone/data
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: flexvolsmb-drone-data
-  namespace: default
+  namespace: drone
 spec:
   accessModes:
     - ReadWriteMany
@@ -148,17 +152,17 @@ spec:
   flexVolume:
     driver: mount/smb
     secretRef:
-      name: smb-secret
+      name: flexvolsmb-credentials
     options:
-      opts: domain=bessems.eu,file_mode=0777,dir_mode=0777,iocharset=utf8
-      server: 192.168.11.225
+      opts: file_mode=0777,dir_mode=0777,iocharset=utf8
+      server: 192.168.154.225
       share: /K3s.Volumes/traefikcertsdumper/export
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: flexvolsmb-drone-certs
-  namespace: default
+  namespace: drone
 spec:
   accessModes:
     - ReadWriteMany
@@ -180,17 +184,17 @@ spec:
   flexVolume:
     driver: mount/smb
     secretRef:
-      name: smb-secret
+      name: flexvolsmb-credentials
     options:
-      opts: domain=bessems.eu,file_mode=0777,dir_mode=0777,iocharset=utf8
-      server: 192.168.11.225
+      opts: file_mode=0777,dir_mode=0777,iocharset=utf8
+      server: 192.168.154.225
       share: /K3s.Volumes/lighttpd/websites/sn.itch.fyi/Repository/rel
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: flexvolsmb-drone-output
-  namespace: default
+  namespace: drone
 spec:
   accessModes:
     - ReadWriteMany
@@ -212,17 +216,17 @@ spec:
   flexVolume:
     driver: mount/smb
     secretRef:
-      name: smb-secret
+      name: flexvolsmb-credentials
     options:
-      opts: domain=bessems.eu,file_mode=0777,dir_mode=0777,iocharset=utf8
-      server: 192.168.11.225
+      opts: file_mode=0777,dir_mode=0777,iocharset=utf8
+      server: 192.168.154.225
       share: /K3s.Volumes/drone/scratch
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: flexvolsmb-drone-scratch
-  namespace: default
+  namespace: drone
 spec:
   accessModes:
     - ReadWriteMany
@@ -234,8 +238,8 @@ spec:
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  namespace: default
   name: drone
+  namespace: drone
 rules:
   - apiGroups:
       - ""
@@ -261,7 +265,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: drone
-  namespace: default
+  namespace: drone
 subjects:
   - kind: ServiceAccount
     name: drone
diff --git a/services/Unifi/_namespace-Unifi.yml b/services/Unifi/_namespace-Unifi.yml
deleted file mode 100644
index 203b17b..0000000
--- a/services/Unifi/_namespace-Unifi.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: unifi
diff --git a/services/Unifi/deployment-Unifi.yml b/services/Unifi/deployment-Unifi.yml
deleted file mode 100644
index d02f56f..0000000
--- a/services/Unifi/deployment-Unifi.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: unifi
-  namespace: unifi
-  labels:
-    app: unifi
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: unifi
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        app: unifi
-    spec:
-      containers:
-      - name: unifi
-        image: bv11-cr01.bessems.eu/proxy/linuxserver/unifi-controller
-        ports:
-          - name: web
-            containerPort: 8443
-          - name: comm
-            containerPort: 8080
-          - name: bandwidth
-            containerPort: 6789
-          - name: syslog
-            containerPort: 5514
-          - name: stun
-            containerPort: 3479
-            protocol: UDP
-          - name: discovery
-            containerPort: 10001
-            protocol: UDP
-        volumeMounts:
-        - mountPath: /config
-          name: longhorn-unifi-config
-      volumes:
-      - name: longhorn-unifi-config
-        persistentVolumeClaim:
-          claimName: longhorn-unifi-config
diff --git a/services/Unifi/ingressRoute-Unifi.yml b/services/Unifi/ingressRoute-Unifi.yml
deleted file mode 100644
index 9e041b2..0000000
--- a/services/Unifi/ingressRoute-Unifi.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: unifi
-  namespace: unifi
-spec:
-  entryPoints:
-    - websecure
-  routes:
-  - match: Host(`wifi.spamasaurus.com`)
-    kind: Rule
-    services:
-    - name: unifi
-      namespace: unifi
-      port: 8443
-      scheme: https
-#    middlewares:
-#    - name: security-headers@file
-#    - name: compression@file
diff --git a/services/Unifi/persistentVolumeClaim-Unifi.yml b/services/Unifi/persistentVolumeClaim-Unifi.yml
deleted file mode 100644
index 6d5cce1..0000000
--- a/services/Unifi/persistentVolumeClaim-Unifi.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: longhorn-unifi-config
-  namespace: unifi
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: longhorn
-  resources:
-    requests:
-      storage: 2Gi
diff --git a/services/Unifi/service-Unifi.yml b/services/Unifi/service-Unifi.yml
deleted file mode 100644
index 580f0a2..0000000
--- a/services/Unifi/service-Unifi.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: unifi
-  namespace: unifi
-spec:
-  ports:
-    - protocol: TCP
-      name: web
-      port: 8443
-  selector:
-    app: unifi
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: unifi-tcp
-  namespace: unifi
-spec:
-  type: LoadBalancer
-  ports:
-    - protocol: TCP
-      name: comm
-      port: 8080
-    - protocol: TCP
-      name: bandwidth
-      port: 6789
-    - protocol: TCP
-      name: syslog
-      port: 5514
-  selector:
-    app: unifi
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: unifi-udp
-  namespace: unifi
-spec:
-  type: LoadBalancer
-  ports:
-    - protocol: UDP
-      name: stun
-      port: 3479
-    - protocol: UDP
-      name: discovery
-      port: 10001
-  selector:
-    app: unifi