diff --git a/kubernetes/main/apps/home-automation/home-assistant/app/helmrelease.yaml b/kubernetes/main/apps/home-automation/home-assistant/app/helmrelease.yaml
index ae2af1a6..ccbda093 100644
--- a/kubernetes/main/apps/home-automation/home-assistant/app/helmrelease.yaml
+++ b/kubernetes/main/apps/home-automation/home-assistant/app/helmrelease.yaml
@@ -35,28 +35,20 @@ spec:
     - name: volsync
       namespace: storage
   values:
-    defaultPodOptions:
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - weight: 1
-              preference:
-                matchExpressions:
-                  - key: nabucasa.feature.node.kubernetes.io/skyconnect
-                    operator: Exists
-      annotations:
-        k8s.v1.cni.cncf.io/networks: |
-          [{
-            "name":"multus-iot",
-            "namespace": "kube-system",
-            "ips": ["192.168.101.254/24"]
-          }]
-        secret.reloader.stakater.com/reload: "home-assistant-emqx-init,home-assistant-secret"
-      securityContext:
-        runAsUser: 0
-        runAsGroup: 0
     controllers:
       home-assistant:
+        pod:
+          annotations:
+            k8s.v1.cni.cncf.io/networks: |
+              [{
+                "name":"multus-iot",
+                "namespace": "kube-system",
+                "ips": ["192.168.101.254/24"]
+              }]
+            secret.reloader.stakater.com/reload: "home-assistant-emqx-init,home-assistant-secret"
+          securityContext:
+            runAsUser: 0
+            runAsGroup: 0
         containers:
           app:
             image:
@@ -146,20 +138,6 @@ spec:
                 mv /config/.hass-config/* /config/.hass-config/.* /config
                 rmdir /config/.hass-config/
               fi
-          usbip-attach:
-            image:
-              repository: ghcr.io/prehor/usbip
-              tag: 6.6.31
-            restartPolicy: Always  # Sidecar container
-            env:
-              USBIP_HOST: h1.${SECRET_DOMAIN}
-            lifecycle:
-              preStop:
-                exec:
-                  command:
-                    - /entrypoint.sh --detach
-            securityContext:
-              privileged: true
     service:
       app:
         controller: home-assistant
@@ -206,20 +184,6 @@ spec:
             subPath: ssh-privatekey
           - path: /root/.ssh/known_hosts2
             subPath: ssh-known-hosts
-      host-dev:
-        type: hostPath
-        hostPath: /dev
-        globalMounts:
-          - path: /dev
-            mountPropagation: HostToContainer
-      host-sys:
-        type: hostPath
-        hostPath: /sys
-        advancedMounts:
-          home-assistant:
-            usbip-attach:
-              - path: /sys
-                mountPropagation: Bidirectional
       logs:
         type: emptyDir
         globalMounts:
diff --git a/kubernetes/main/apps/kube-system/kustomization.yaml b/kubernetes/main/apps/kube-system/kustomization.yaml
index 26691fd3..0c9948fe 100644
--- a/kubernetes/main/apps/kube-system/kustomization.yaml
+++ b/kubernetes/main/apps/kube-system/kustomization.yaml
@@ -10,5 +10,4 @@ resources:
   - ./kube-vip/ks.yaml
   - ./metrics-server/ks.yaml
   - ./multus/ks.yaml
-  - ./node-feature-discovery/ks.yaml
   - ./reloader/ks.yaml
diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/app/helmrelease.yaml b/kubernetes/main/apps/kube-system/node-feature-discovery/app/helmrelease.yaml
deleted file mode 100644
index ea117464..00000000
--- a/kubernetes/main/apps/kube-system/node-feature-discovery/app/helmrelease.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta2.json
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: node-feature-discovery
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: node-feature-discovery
-      version: 0.16.4
-      sourceRef:
-        kind: HelmRepository
-        name: node-feature-discovery
-        namespace: flux-system
-  install:
-    crds: CreateReplace
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    crds: CreateReplace
-    remediation:
-      strategy: rollback
-      retries: 3
-  values:
-    master:
-      resources:
-        requests:
-          cpu: 10m
-          memory: 64Mi
-        limits:
-          memory: 64Mi
-    worker:
-      config:
-        core:
-          sources: ["pci", "system", "usb"]
-      resources:
-        requests:
-          cpu: 10m
-          memory: 64Mi
-        limits:
-          memory: 64Mi
-    prometheus:
-      enable: true
diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/app/kustomization.yaml b/kubernetes/main/apps/kube-system/node-feature-discovery/app/kustomization.yaml
deleted file mode 100644
index 17cbc72b..00000000
--- a/kubernetes/main/apps/kube-system/node-feature-discovery/app/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./helmrelease.yaml
diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/ks.yaml b/kubernetes/main/apps/kube-system/node-feature-discovery/ks.yaml
deleted file mode 100644
index 4f8bbd3f..00000000
--- a/kubernetes/main/apps/kube-system/node-feature-discovery/ks.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app node-feature-discovery
-  namespace: flux-system
-spec:
-  targetNamespace: kube-system
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  path: ./kubernetes/main/apps/kube-system/node-feature-discovery/app
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops
-  wait: true
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json
-apiVersion: kustomize.toolkit.fluxcd.io/v1
-kind: Kustomization
-metadata:
-  name: &app node-feature-discovery-rules
-  namespace: flux-system
-spec:
-  targetNamespace: kube-system
-  commonMetadata:
-    labels:
-      app.kubernetes.io/name: *app
-  dependsOn:
-    - name: node-feature-discovery
-  path: ./kubernetes/main/apps/kube-system/node-feature-discovery/rules
-  prune: true
-  sourceRef:
-    kind: GitRepository
-    name: home-ops
-  wait: true
-  interval: 30m
-  retryInterval: 1m
-  timeout: 5m
diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/rules/kustomization.yaml b/kubernetes/main/apps/kube-system/node-feature-discovery/rules/kustomization.yaml
deleted file mode 100644
index 8d34d5ac..00000000
--- a/kubernetes/main/apps/kube-system/node-feature-discovery/rules/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# yaml-language-server: $schema=https://json.schemastore.org/kustomization
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ./nabucasa-skyconnect-device.yaml
diff --git a/kubernetes/main/apps/kube-system/node-feature-discovery/rules/nabucasa-skyconnect-device.yaml b/kubernetes/main/apps/kube-system/node-feature-discovery/rules/nabucasa-skyconnect-device.yaml
deleted file mode 100644
index cf54d7f0..00000000
--- a/kubernetes/main/apps/kube-system/node-feature-discovery/rules/nabucasa-skyconnect-device.yaml
+++ /dev/null
@@ -1,16 +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: nabucasa-skyconnect-device
-spec:
-  rules:
-    - name: nabucasa-skyconnect
-      labels:
-        nabucasa.feature.node.kubernetes.io/skyconnect: "true"
-      matchFeatures:
-        - feature: usb.device
-          matchExpressions:
-            device: { op: In, value: ["ea60"] }
-            vendor: { op: In, value: ["10c4"] }
diff --git a/kubernetes/main/flux/repositories/helm/kustomization.yaml b/kubernetes/main/flux/repositories/helm/kustomization.yaml
index 2b9ebb2b..f7422b21 100644
--- a/kubernetes/main/flux/repositories/helm/kustomization.yaml
+++ b/kubernetes/main/flux/repositories/helm/kustomization.yaml
@@ -16,7 +16,6 @@ resources:
   - ./k8tz.yaml
   - ./jetstack.yaml
   - ./metrics-server.yaml
-  - ./node-feature-discovery.yaml
   - ./openebs-zfs-localpv.yaml
   - ./openebs.yaml
   - ./prometheus-community.yaml
diff --git a/kubernetes/main/flux/repositories/helm/node-feature-discovery.yaml b/kubernetes/main/flux/repositories/helm/node-feature-discovery.yaml
deleted file mode 100644
index e5c5ffe5..00000000
--- a/kubernetes/main/flux/repositories/helm/node-feature-discovery.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrepository-source-v1beta2.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: node-feature-discovery
-  namespace: flux-system
-spec:
-  interval: 1h
-  url: https://kubernetes-sigs.github.io/node-feature-discovery/charts