diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 1dd5ee0..9ef5e46 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -25,11 +25,9 @@
 - name: Add Docker official APT repository
   ansible.builtin.apt_repository:
     repo: >-
-      deb [arch={{ 'amd64' if ansible_architecture == 'x86_64' else 'arm64' if ansible_architecture == 'aarch64' else ansible_architecture }}
-      signed-by=/etc/apt/keyrings/docker.asc]
+      deb [arch={{ ansible_pkg_arch }} signed-by=/etc/apt/keyrings/docker.asc]
       https://download.docker.com/linux/{{ ansible_distribution | lower }}
-      {{ ansible_distribution_release }}
-      stable
+      {{ ansible_distribution_release }} stable
     state: present
     filename: docker
     update_cache: true
@@ -48,12 +46,9 @@
 
 - name: Ensure Docker services are running and enabled
   ansible.builtin.service:
-    name: "{{ item }}"
+    name: docker
     state: started
     enabled: true
-  loop:
-    - docker
-    - containerd
   become: true
 
 - name: Create docker user for container execution