diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml
index 4ce5e75..a7e6da3 100644
--- a/vars/Ubuntu.yml
+++ b/vars/Ubuntu.yml
@@ -6,6 +6,7 @@ docker_dependency_pkgs:
   - python3-docker
   - python3-dockerpycreds
   - python3-dockerpty
+
 docker_io_pkgs:
   - docker.io
   - containerd
@@ -29,24 +30,36 @@ docker_nvidia_driver_dependencies:
   - curl
   - gnupg-agent
   - software-properties-common
-
+  
 docker_nvidia_driver_packages:
-  - nvidia-headless-550
-  - libnvidia-encode-550
-  - libnvidia-decode-550
-  - libnvidia-compute-550
-  - nvidia-utils-550
-  - nvidia-kernel-common-550
-  - nvidia-kernel-source-550
+  - libnvidia-common-550-server
+  - libnvidia-decode-550-server
+  - libnvidia-encode-550-server
+  - nvidia-driver-550-server
+  - nvidia-headless-no-dkms-550-server
+  - nvidia-kernel-common-550-server
+  - nvidia-kernel-source-550-server
+  - nvidia-utils-550-server
 
 docker_nvidia_docker_packages:
   - libnvidia-container-tools
   - libnvidia-container1
-  - nvidia-container-toolkit
   - nvidia-docker2
   - nvidia-container-runtime
+  - nvidia-container-toolkit
+
+docker_nvidia_cuda_packages:
+  - libnvidia-ml-dev
+  - nvidia-cudnn
+  - nvidia-compute-utils-550-server
+  - libnvidia-compute-550-server
+  - nvidia-cuda-dev
+  - nvidia-cuda-gdb
+  - nvidia-cuda-toolkit-doc
+  - nvidia-cuda-toolkit
 
 docker_py3_pkgs:
   - docker
   - docker-compose
+
 docker_repo_url: https://download.docker.com/linux
diff --git a/vars/Ubuntu22.yml b/vars/Ubuntu22.yml
index 4ce5e75..1c8eec2 100644
--- a/vars/Ubuntu22.yml
+++ b/vars/Ubuntu22.yml
@@ -6,6 +6,7 @@ docker_dependency_pkgs:
   - python3-docker
   - python3-dockerpycreds
   - python3-dockerpty
+
 docker_io_pkgs:
   - docker.io
   - containerd
@@ -31,22 +32,34 @@ docker_nvidia_driver_dependencies:
   - software-properties-common
 
 docker_nvidia_driver_packages:
-  - nvidia-headless-550
-  - libnvidia-encode-550
-  - libnvidia-decode-550
-  - libnvidia-compute-550
-  - nvidia-utils-550
-  - nvidia-kernel-common-550
-  - nvidia-kernel-source-550
+  - libnvidia-common-550-server
+  - libnvidia-decode-550-server
+  - libnvidia-encode-550-server
+  - nvidia-driver-550-server
+  - nvidia-headless-no-dkms-550-server
+  - nvidia-kernel-common-550-server
+  - nvidia-kernel-source-550-server
+  - nvidia-utils-550-server
 
 docker_nvidia_docker_packages:
   - libnvidia-container-tools
   - libnvidia-container1
-  - nvidia-container-toolkit
   - nvidia-docker2
   - nvidia-container-runtime
+  - nvidia-container-toolkit
+
+docker_nvidia_cuda_packages:
+  - libnvidia-ml-dev
+  - nvidia-cudnn
+  - nvidia-compute-utils-550-server
+  - libnvidia-compute-550-server
+  - nvidia-cuda-dev
+  - nvidia-cuda-gdb
+  - nvidia-cuda-toolkit-doc
+  - nvidia-cuda-toolkit
 
 docker_py3_pkgs:
   - docker
   - docker-compose
+
 docker_repo_url: https://download.docker.com/linux