diff --git a/kubernetes/apps/default/zwave-js-ui/app/helmrelease.yaml b/.archive/kubernetes/zwave-js-ui/app/helmrelease.yaml
similarity index 100%
rename from kubernetes/apps/default/zwave-js-ui/app/helmrelease.yaml
rename to .archive/kubernetes/zwave-js-ui/app/helmrelease.yaml
diff --git a/kubernetes/apps/default/zwave-js-ui/app/kustomization.yaml b/.archive/kubernetes/zwave-js-ui/app/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/default/zwave-js-ui/app/kustomization.yaml
rename to .archive/kubernetes/zwave-js-ui/app/kustomization.yaml
diff --git a/kubernetes/apps/default/zwave-js-ui/ks.yaml b/.archive/kubernetes/zwave-js-ui/ks.yaml
similarity index 100%
rename from kubernetes/apps/default/zwave-js-ui/ks.yaml
rename to .archive/kubernetes/zwave-js-ui/ks.yaml
diff --git a/kubernetes/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml
index 1dcaab69d..b94174700 100644
--- a/kubernetes/apps/default/kustomization.yaml
+++ b/kubernetes/apps/default/kustomization.yaml
@@ -52,6 +52,5 @@ resources:
   - ./vikunja/ks.yaml
   - ./webhook/ks.yaml
   - ./zigbee2mqtt/ks.yaml
-  - ./zwave-js-ui/ks.yaml
   # Default resources
   - jobs-rbac.yaml
diff --git a/kubernetes/apps/kube-system/node-feature-discovery/rules/aeotec-zwave-device.yaml b/kubernetes/apps/kube-system/node-feature-discovery/rules/aeotec-zwave-device.yaml
deleted file mode 100644
index d51c45901..000000000
--- a/kubernetes/apps/kube-system/node-feature-discovery/rules/aeotec-zwave-device.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/nfd.k8s-sigs.io/nodefeaturerule_v1alpha1.json
-apiVersion: nfd.k8s-sigs.io/v1alpha1
-kind: NodeFeatureRule
-metadata:
-  name: aeotec-zwave-device
-spec:
-  rules:
-    - # Aeotec Z-Stick Gen5+
-      name: aeotec.zwave
-      labels:
-        aeotec.feature.node.kubernetes.io/zwave: "true"
-      matchFeatures:
-        - feature: usb.device
-          matchExpressions:
-            class: { op: In, value: ["02"] }
-            vendor: { op: In, value: ["0658"] }
-            device: { op: In, value: ["0200"] }
diff --git a/kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml b/kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml
index 58ca38536..876c67e7c 100644
--- a/kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml
+++ b/kubernetes/apps/kube-system/node-feature-discovery/rules/kustomization.yaml
@@ -4,6 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kube-system
 resources:
-  - ./aeotec-zwave-device.yaml
   - ./google-coral-device.yaml
   - ./nodo-rflink-device.yaml