diff --git a/argocd/manifests/frigate/deployment.yaml b/argocd/manifests/frigate/deployment.yaml
index 91c9a77..45bc9e1 100644
--- a/argocd/manifests/frigate/deployment.yaml
+++ b/argocd/manifests/frigate/deployment.yaml
@@ -23,7 +23,6 @@ spec:
               mountPath: /config-ro
             - name: config
               mountPath: /config
-      runtimeClassName: nvidia
       containers:
         - name: frigate
           image: ghcr.io/blakeblackshear/frigate:0.17.0-rc2-tensorrt
diff --git a/argocd/manifests/nvidia-device-plugin/daemonset.yaml b/argocd/manifests/nvidia-device-plugin/daemonset.yaml
index a0f0b11..e3c9081 100644
--- a/argocd/manifests/nvidia-device-plugin/daemonset.yaml
+++ b/argocd/manifests/nvidia-device-plugin/daemonset.yaml
@@ -19,11 +19,15 @@ spec:
         - key: nvidia.com/gpu
           operator: Exists
           effect: NoSchedule
-      runtimeClassName: nvidia
       priorityClassName: system-node-critical
       containers:
         - name: nvidia-device-plugin
           image: nvcr.io/nvidia/k8s-device-plugin:v0.18.2
+          env:
+            - name: DEVICE_LIST_STRATEGY
+              value: cdi-annotations
+            - name: CDI_ROOT
+              value: /var/run/cdi
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:
@@ -31,7 +35,13 @@ spec:
           volumeMounts:
             - name: device-plugins
               mountPath: /var/lib/kubelet/device-plugins
+            - name: cdi-specs
+              mountPath: /var/run/cdi
+              readOnly: true
       volumes:
         - name: device-plugins
           hostPath:
             path: /var/lib/kubelet/device-plugins
+        - name: cdi-specs
+          hostPath:
+            path: /var/run/cdi
diff --git a/argocd/manifests/nvidia-device-plugin/runtime-class.yaml b/argocd/manifests/nvidia-device-plugin/runtime-class.yaml
deleted file mode 100644
index 7ba6add..0000000
--- a/argocd/manifests/nvidia-device-plugin/runtime-class.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-apiVersion: node.k8s.io/v1
-kind: RuntimeClass
-metadata:
-  name: nvidia
-handler: nvidia
diff --git a/nixos/ringtail/configuration.nix b/nixos/ringtail/configuration.nix
index 9fde856..1137a9a 100644
--- a/nixos/ringtail/configuration.nix
+++ b/nixos/ringtail/configuration.nix
@@ -118,11 +118,9 @@ in
     containerdConfigTemplate = ''
       {{ template "base" . }}
 
-      [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.nvidia]
-        privileged_without_host_devices = false
-        runtime_type = "io.containerd.runc.v2"
-      [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.nvidia.options]
-        BinaryName = "${pkgs.nvidia-container-toolkit}/bin/nvidia-container-runtime"
+      [plugins.'io.containerd.cri.v1.runtime']
+        enable_cdi = true
+        cdi_spec_dirs = ["/var/run/cdi", "/etc/cdi"]
     '';
   };