diff --git a/nas.yml b/nas.yml
index 2334af7bce..5df9d22cac 100644
--- a/nas.yml
+++ b/nas.yml
@@ -22,17 +22,12 @@
         - skip_ansible_lint
 
     - role: geerlingguy.docker
-      when: ansible_architecture == "x86_64"
+      vars:
+        docker_apt_filename: download_docker_com_linux_ubuntu
       tags:
         - docker
         - skip_ansible_lint
 
-    - role: geerlingguy.docker_arm
-      when: ansible_architecture == "aarch64"
-      tags:
-        - docker_arm
-        - skip_ansible_lint
-
     ###
     ### Ansible-NAS Roles
     ###
diff --git a/requirements.yml b/requirements.yml
index 094d3dd4d7..3844a22f66 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,10 +1,7 @@
 ---
 roles:
   - name: geerlingguy.docker
-    version: 6.0.0
-
-  - name: geerlingguy.docker_arm
-    version: 5.0.0
+    version: 7.1.0
 
   - name: bertvv.samba
     version: v2.7.1