diff --git a/roles/deploy-env/files/daemon.json b/roles/deploy-env/files/daemon.json
index ceb065798..29325b352 100644
--- a/roles/deploy-env/files/daemon.json
+++ b/roles/deploy-env/files/daemon.json
@@ -5,6 +5,12 @@
     "log-opts": {
         "max-size": "100m"
     },
+{% if registry_mirror is defined %}
+    "registry-mirrors": ["{{ registry_mirror }}"],
+{% endif %}
+{% if insecure_registries is defined %}
+    "insecure-registries": ["{{ insecure_registries }}"],
+{% endif %}
     "storage-driver": "overlay2",
     "live-restore": true
 }
diff --git a/roles/deploy-env/tasks/containerd.yaml b/roles/deploy-env/tasks/containerd.yaml
index 39813b51d..f1ac850bc 100644
--- a/roles/deploy-env/tasks/containerd.yaml
+++ b/roles/deploy-env/tasks/containerd.yaml
@@ -49,21 +49,11 @@
     state: present
     update_cache: true
 
-- name: Configure Docker daemon
-  template:
-    src: files/daemon.json
-    dest: /etc/docker/daemon.json
 
 - name: Add users to docker group
   command: "adduser {{ item }} docker"
   loop: "{{ docker_users }}"
 
-- name: Restart docker
-  service:
-    name: docker
-    daemon_reload: yes
-    state: restarted
-
 - name: Reset ssh connection to apply user changes.
   meta: reset_connection
 
@@ -75,14 +65,21 @@
   args:
     executable: /bin/bash
 
-- name: Set mirror_fqdn fact
+- name: Set registry_mirror fact
   when:
     - registry_mirror is not defined
     - zuul_site_mirror_fqdn is defined
   set_fact:
     registry_mirror: "http://{{ zuul_site_mirror_fqdn }}:8082"
 
-- name: Set regitstry namespaces
+- name: Set insecure_registries fact for Docker
+  when:
+    - insecure_registries is not defined
+    - zuul_site_mirror_fqdn is defined
+  set_fact:
+    insecure_registries: "{{ zuul_site_mirror_fqdn }}:8082"
+
+- name: Set registry_namespaces fact
   set_fact:
     registry_namespaces:
       - namespace: "_default"
@@ -156,4 +153,15 @@
     name: containerd
     daemon_reload: yes
     state: restarted
+
+- name: Configure Docker daemon
+  template:
+    src: files/daemon.json
+    dest: /etc/docker/daemon.json
+
+- name: Restart docker
+  service:
+    name: docker
+    daemon_reload: yes
+    state: restarted
 ...