diff --git a/roles/deploy-env/tasks/containerd.yaml b/roles/deploy-env/tasks/containerd.yaml
index 372933ec9..34924c441 100644
--- a/roles/deploy-env/tasks/containerd.yaml
+++ b/roles/deploy-env/tasks/containerd.yaml
@@ -80,6 +80,11 @@
         skip_verify: true
   when: registry_mirror is defined
 
+- name: Init registry_namespaces if not defined
+  set_fact:
+    registry_namespaces: "[]"
+  when: not registry_namespaces is defined
+
 - name: Buildset registry namespace
   when: buildset_registry is defined
   block:
@@ -106,11 +111,6 @@
           ca: "/usr/local/share/ca-certificates/{{ buildset_registry_alias }}.crt"
           auth: "{{ (buildset_registry.username + ':' + buildset_registry.password) | b64encode }}"
 
-    - name: Init registry_namespaces if not defined
-      set_fact:
-        registry_namespaces: "[]"
-      when: not registry_namespaces is defined
-
     - name: Append buildset_registry to registry namespaces
       when:
         - buildset_registry_namespace is defined