diff --git a/packaging/debian/nvidia-container-toolkit.postrm b/packaging/debian/nvidia-container-toolkit.postrm
index bf4e8a5a5..0b4ebaf1c 100644
--- a/packaging/debian/nvidia-container-toolkit.postrm
+++ b/packaging/debian/nvidia-container-toolkit.postrm
@@ -6,11 +6,11 @@ NVIDIA_CONTAINER_RUNTIME_HOOK=/usr/bin/nvidia-container-runtime-hook
 NVIDIA_CONTAINER_TOOLKIT=/usr/bin/nvidia-container-toolkit
 
 case "$1" in
-    purge)
+    purge|remove)
         [ -L "${NVIDIA_CONTAINER_TOOLKIT}" ] && rm ${NVIDIA_CONTAINER_TOOLKIT}
     ;;
 
-    upgrade|failed-upgrade|remove|abort-install|abort-upgrade|disappear)
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
 
     *)
diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
index 408068668..8f7d57690 100644
--- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec
+++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
@@ -78,6 +78,11 @@ if [ "$1" = 0 ]; then  # package is uninstalled, not upgraded
   if [ -L %{_bindir}/nvidia-container-toolkit ]; then rm -f %{_bindir}/nvidia-container-toolkit; fi
 fi
 
+%postun base
+if [ "$1" -eq 0 ]; then
+    rm -f %{_sysconfdir}/cdi/nvidia.yaml
+fi
+
 %files
 %license LICENSE
 %{_bindir}/nvidia-container-runtime-hook
@@ -109,6 +114,7 @@ Provides tools such as the NVIDIA Container Runtime and NVIDIA Container Toolkit
 %{_sysconfdir}/systemd/system/nvidia-cdi-refresh.service
 %{_sysconfdir}/systemd/system/nvidia-cdi-refresh.path
 %config(noreplace) %{_sysconfdir}/nvidia-container-toolkit/nvidia-cdi-refresh.env
+%ghost %{_sysconfdir}/cdi/nvidia.yaml
 
 # The OPERATOR EXTENSIONS package consists of components that are required to enable GPU support in Kubernetes.
 # This package is not distributed as part of the NVIDIA Container Toolkit RPMs.