diff --git a/resources/tasks/docker/create_docker_container.yml b/resources/tasks/docker/create_docker_container.yml
index 9e25d4fdf1..034599ddad 100644
--- a/resources/tasks/docker/create_docker_container.yml
+++ b/resources/tasks/docker/create_docker_container.yml
@@ -37,9 +37,7 @@
     default_host_ip: ""
     device_read_bps: "{{ lookup('vars', _var_prefix + '_docker_device_read_bps', default=omit) }}"
     device_read_iops: "{{ lookup('vars', _var_prefix + '_docker_device_read_iops', default=omit) }}"
-    device_requests: "{{ nvidia_docker_device_requests
-                      if use_nvidia
-                      else lookup('vars', _var_prefix + '_docker_device_requests', default=omit) }}"
+    device_requests: "{{ lookup('vars', _var_prefix + '_docker_device_requests', default=omit) }}"
     device_write_bps: "{{ lookup('vars', _var_prefix + '_docker_device_write_bps', default=omit) }}"
     device_write_iops: "{{ lookup('vars', _var_prefix + '_docker_device_write_iops', default=omit) }}"
     devices: "{{ lookup('vars', _var_prefix + '_docker_devices', default=omit) }}"
@@ -48,7 +46,9 @@
     dns_servers: "{{ lookup('vars', _var_prefix + '_docker_dns_servers', default=omit) }}"
     domainname: "{{ lookup('vars', _var_prefix + '_docker_domainname', default=omit) }}"
     entrypoint: "{{ lookup('vars', _var_prefix + '_docker_entrypoint', default=omit) }}"
-    env: "{{ lookup('vars', _var_prefix + '_docker_envs', default=omit) }}"
+    env: "{{ (nvidia_docker_env if use_nvidia else {})
+             | combine(lookup('vars', _var_prefix + '_docker_envs', default={}))
+             | default(omit) }}"
     env_file: "{{ lookup('vars', _var_prefix + '_docker_env_file', default=omit) }}"
     etc_hosts: "{{ lookup('vars', _var_prefix + '_docker_hosts', default=omit)
                 if not ('container:' in lookup('vars', _var_prefix + '_docker_network_mode', default=docker_networks_name_common))
diff --git a/resources/tasks/docker/set_docker_devices_variable.yml b/resources/tasks/docker/set_docker_devices_variable.yml
index b77a31dfc4..c75259d075 100644
--- a/resources/tasks/docker/set_docker_devices_variable.yml
+++ b/resources/tasks/docker/set_docker_devices_variable.yml
@@ -21,5 +21,4 @@
 
     - name: Resources | Tasks | Docker | Set Docker Devices Variable | Set 'docker_devices' variable # noqa var-naming[no-jinja]
       ansible.builtin.set_fact:
-        "{{ docker_devices_var_name }}": "{{ (['/dev/dri:/dev/dri'] if gpu.intel else [])
-                                             + lookup('vars', role_name + '_docker_devices_default', default=[]) }}"
+        "{{ docker_devices_var_name }}": "{{ ['/dev/dri:/dev/dri'] + lookup('vars', role_name + '_docker_devices_default', default=[]) }}"
diff --git a/roles/emby/tasks/main2.yml b/roles/emby/tasks/main2.yml
index ad014ffbc8..991b435026 100644
--- a/roles/emby/tasks/main2.yml
+++ b/roles/emby/tasks/main2.yml
@@ -22,7 +22,7 @@
 
 - name: Docker Devices Task
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/set_docker_devices_variable.yml"
-  when: gpu.intel
+  when: gpu.intel or use_nvidia
 
 - name: Create Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"
diff --git a/roles/jellyfin/tasks/main2.yml b/roles/jellyfin/tasks/main2.yml
index 4c9c921e4b..e1b9b33be7 100644
--- a/roles/jellyfin/tasks/main2.yml
+++ b/roles/jellyfin/tasks/main2.yml
@@ -21,7 +21,7 @@
 
 - name: Docker Devices Task
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/set_docker_devices_variable.yml"
-  when: gpu.intel
+  when: gpu.intel or use_nvidia
 
 - name: Import preinstall task
   ansible.builtin.import_tasks: "subtasks/preinstall.yml"
diff --git a/roles/nvidia/defaults/main.yml b/roles/nvidia/defaults/main.yml
index f680cacd59..419e246b77 100644
--- a/roles/nvidia/defaults/main.yml
+++ b/roles/nvidia/defaults/main.yml
@@ -86,14 +86,6 @@ nvidia_nvtop_apt_repo_file: "/etc/apt/sources.list.d/flexiondotorg.list"
 # Docker
 ################################
 
-nvidia_docker_device_requests:
-  - driver: nvidia
-    count: -1
-    capabilities:
-      - - gpu
-        - compute
-        - utility
-
 nvidia_docker_env:
   NVIDIA_DRIVER_CAPABILITIES: "compute,video,utility"
   NVIDIA_VISIBLE_DEVICES: "all"
diff --git a/roles/plex/tasks/main2.yml b/roles/plex/tasks/main2.yml
index b0089b27cc..d28100bd87 100644
--- a/roles/plex/tasks/main2.yml
+++ b/roles/plex/tasks/main2.yml
@@ -63,7 +63,7 @@
 
 - name: Docker Devices Task
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/set_docker_devices_variable.yml"
-  when: gpu.intel
+  when: gpu.intel or use_nvidia
 
 - name: Create Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/create_docker_container.yml"