diff --git a/roles/base_setup/tasks/main.yml b/roles/base_setup/tasks/main.yml
index 76ceee2..6e8bf23 100644
--- a/roles/base_setup/tasks/main.yml
+++ b/roles/base_setup/tasks/main.yml
@@ -19,70 +19,6 @@
     autoclean: yes
   become: yes
 
-# ========== Fix Docker runc version ==========
-- name: Check current runc version
-  command: runc --version
-  register: runc_version_check
-  ignore_errors: yes
-  changed_when: false
-  become: yes
-
-- name: Download and update runc to v1.2.4 if needed
-  block:
-    - name: Download runc v1.2.4
-      get_url:
-        url: https://github.com/opencontainers/runc/releases/download/v1.2.4/runc.amd64
-        dest: /tmp/runc.amd64
-        mode: '0755'
-      become: yes
-
-    - name: Stop docker service
-      systemd:
-        name: docker
-        state: stopped
-      become: yes
-
-    - name: Backup existing runc
-      command: mv /usr/bin/runc /usr/bin/runc.bak
-      args:
-        creates: /usr/bin/runc.bak
-      become: yes
-
-    - name: Install new runc
-      copy:
-        src: /tmp/runc.amd64
-        dest: /usr/bin/runc
-        remote_src: yes
-        mode: '0755'
-      become: yes
-
-    - name: Start docker service
-      systemd:
-        name: docker
-        state: started
-      become: yes
-
-    - name: Clean up temporary runc file
-      file:
-        path: /tmp/runc.amd64
-        state: absent
-      become: yes
-
-    - name: Verify new runc version
-      command: runc --version
-      register: new_runc_version
-      become: yes
-
-    - name: Show runc update result
-      debug:
-        msg: "runc updated to version: {{ new_runc_version.stdout }}"
-      become: yes
-
-  when: 
-    - runc_version_check is failed or 
-      "'1.2.4' not in runc_version_check.stdout"
-    - ansible_architecture == "x86_64"
-  become: yes
   
 - name: Disable IPv6 via sysctl
   sysctl:
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 5cd12fb..b1b7089 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -154,4 +154,69 @@
 
     - name: Show Docker metrics test result
       debug:
-        var: metrics_test.stdout
\ No newline at end of file
+        var: metrics_test.stdout
+
+# ========== Fix Docker runc version ==========
+- name: Check current runc version
+  command: runc --version
+  register: runc_version_check
+  ignore_errors: yes
+  changed_when: false
+  become: yes
+
+- name: Download and update runc to v1.2.4 if needed
+  block:
+    - name: Download runc v1.2.4
+      get_url:
+        url: https://github.com/opencontainers/runc/releases/download/v1.2.4/runc.amd64
+        dest: /tmp/runc.amd64
+        mode: '0755'
+      become: yes
+
+    - name: Stop docker service
+      systemd:
+        name: docker
+        state: stopped
+      become: yes
+
+    - name: Backup existing runc
+      command: mv /usr/bin/runc /usr/bin/runc.bak
+      args:
+        creates: /usr/bin/runc.bak
+      become: yes
+
+    - name: Install new runc
+      copy:
+        src: /tmp/runc.amd64
+        dest: /usr/bin/runc
+        remote_src: yes
+        mode: '0755'
+      become: yes
+
+    - name: Start docker service
+      systemd:
+        name: docker
+        state: started
+      become: yes
+
+    - name: Clean up temporary runc file
+      file:
+        path: /tmp/runc.amd64
+        state: absent
+      become: yes
+
+    - name: Verify new runc version
+      command: runc --version
+      register: new_runc_version
+      become: yes
+
+    - name: Show runc update result
+      debug:
+        msg: "runc updated to version: {{ new_runc_version.stdout }}"
+      become: yes
+
+  when: 
+    - runc_version_check is failed or 
+      "'1.2.4' not in runc_version_check.stdout"
+    - ansible_architecture == "x86_64"
+  become: yes
\ No newline at end of file