diff --git a/.archive/kubernetes/nvidia-device-plugin/kustomization.yaml b/kubernetes/apps/nvidia-device-plugin/kustomization.yaml
similarity index 100%
rename from .archive/kubernetes/nvidia-device-plugin/kustomization.yaml
rename to kubernetes/apps/nvidia-device-plugin/kustomization.yaml
diff --git a/.archive/kubernetes/nvidia-device-plugin/namespace.yaml b/kubernetes/apps/nvidia-device-plugin/namespace.yaml
similarity index 74%
rename from .archive/kubernetes/nvidia-device-plugin/namespace.yaml
rename to kubernetes/apps/nvidia-device-plugin/namespace.yaml
index 73f112b..f7ddb2a 100644
--- a/.archive/kubernetes/nvidia-device-plugin/namespace.yaml
+++ b/kubernetes/apps/nvidia-device-plugin/namespace.yaml
@@ -5,4 +5,3 @@ metadata:
   name: nvidia-device-plugin
   labels:
     kustomize.toolkit.fluxcd.io/prune: disabled
-    volsync.backube/privileged-movers: "true"
diff --git a/.archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/app/config/config.yaml b/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/config/config.yml
similarity index 100%
rename from .archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/app/config/config.yaml
rename to kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/config/config.yml
diff --git a/.archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml b/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml
similarity index 93%
rename from .archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml
rename to kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml
index b9b7687..cf0d013 100644
--- a/.archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml
+++ b/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/helmrelease.yaml
@@ -15,7 +15,6 @@ spec:
         kind: HelmRepository
         name: nvdp
         namespace: flux-system
-  maxHistory: 2
   install:
     remediation:
       retries: 3
@@ -23,8 +22,7 @@ spec:
     cleanupOnFail: true
     remediation:
       retries: 3
-  uninstall:
-    keepHistory: false
+      strategy: rollback
   values:
     config:
       name: nvidia-plugin-configs
diff --git a/.archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/app/kustomization.yaml b/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/kustomization.yaml
similarity index 87%
rename from .archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/app/kustomization.yaml
rename to kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/kustomization.yaml
index d36e4f8..b9de271 100644
--- a/.archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/app/kustomization.yaml
+++ b/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/app/kustomization.yaml
@@ -7,6 +7,6 @@ resources:
 configMapGenerator:
   - name: nvidia-plugin-configs
     files:
-      - config.yaml=./config/config.yaml
+      - config.yaml=./config/config.yml
 generatorOptions:
   disableNameSuffixHash: true
diff --git a/.archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/ks.yaml b/kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/ks.yaml
similarity index 100%
rename from .archive/kubernetes/nvidia-device-plugin/nvidia-device-plugin/ks.yaml
rename to kubernetes/apps/nvidia-device-plugin/nvidia-device-plugin/ks.yaml