diff --git a/roles/upload-docker-image/tasks/main.yaml b/roles/upload-docker-image/tasks/main.yaml
index 1e545d9c5..2e5ebf423 100644
--- a/roles/upload-docker-image/tasks/main.yaml
+++ b/roles/upload-docker-image/tasks/main.yaml
@@ -12,20 +12,25 @@
   command: "docker login -u {{ docker_credentials.username }} -p {{ docker_credentials.password }} {{ docker_registry }}"
   no_log: true
 
-- name: Determine if we need to use buildx
-  set_fact:
-    use_buildx: "{{ docker_images | selectattr('arch', 'defined') | list }}"
+- name: Publish docker images
+  block:
+    - name: Determine if we need to use buildx
+      set_fact:
+        use_buildx: "{{ docker_images | selectattr('arch', 'defined') | list }}"
 
-- name: Upload image to dockerhub normally
-  loop: "{{ docker_images }}"
-  loop_control:
-    loop_var: zj_image
-  include_tasks: push.yaml
-  when: not use_buildx
+    - name: Upload image to dockerhub normally
+      loop: "{{ docker_images }}"
+      loop_control:
+        loop_var: zj_image
+      include_tasks: push.yaml
+      when: not use_buildx
 
-- name: Upload image to dockerhub using buildx
-  loop: "{{ docker_images }}"
-  loop_control:
-    loop_var: zj_image
-  include_tasks: buildx.yaml
-  when: use_buildx
+    - name: Upload image to dockerhub using buildx
+      loop: "{{ docker_images }}"
+      loop_control:
+        loop_var: zj_image
+      include_tasks: buildx.yaml
+      when: use_buildx
+  always:
+    - name: Log out of registry
+      command: "docker logout {{ docker_registry }}"