diff --git a/contrib/dind/group_vars/all/distro.yaml b/contrib/dind/group_vars/all/distro.yaml
index b9c2670e9c5..ef90b508aa5 100644
--- a/contrib/dind/group_vars/all/distro.yaml
+++ b/contrib/dind/group_vars/all/distro.yaml
@@ -11,12 +11,14 @@ distro_settings:
     agetty_svc: getty@*
     ssh_service: ssh
     extra_packages: []
+
   ubuntu:
     <<: *DEBIAN
     image: "ubuntu:16.04"
     user: "ubuntu"
     init: |
       /sbin/init
+
   centos: &CENTOS
     image: "centos:7"
     user: "centos"
@@ -28,6 +30,7 @@ distro_settings:
     agetty_svc: getty@* serial-getty@*
     ssh_service: sshd
     extra_packages: []
+
   fedora:
     <<: *CENTOS
     image: "fedora:latest"
diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml
index b8f676fae31..dae1ffecafa 100644
--- a/roles/bootstrap-os/tasks/main.yml
+++ b/roles/bootstrap-os/tasks/main.yml
@@ -16,8 +16,7 @@
     tags:
     - facts
     with_first_found:
-    - &search
-      files:
+    - files:
       - "{{ os_release_dict['ID'] }}-{{ os_release_dict['VARIANT_ID'] }}.yml"
       - "{{ os_release_dict['ID'] }}.yml"
       paths:
@@ -26,12 +25,13 @@
   - name: Include tasks
     include_tasks: "{{ included_tasks_file }}"
     with_first_found:
-    - <<: *search
+    - files:
+      - "{{ os_release_dict['ID'] }}-{{ os_release_dict['VARIANT_ID'] }}.yml"
+      - "{{ os_release_dict['ID'] }}.yml"
       paths: []
     loop_control:
       loop_var: included_tasks_file
 
-
 - name: Create remote_tmp for it is used by another module
   file:
     path: "{{ ansible_remote_tmp | default('~/.ansible/tmp') }}"
@@ -48,7 +48,7 @@
     name: "{{ inventory_hostname }}"
   when: override_system_hostname
 
-- name: Install ceph-commmon package
+- name: Install ceph-common package
   package:
     name:
     - ceph-common
diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml
index f1b97771762..1f1ab347ad7 100644
--- a/roles/container-engine/containerd/tasks/main.yml
+++ b/roles/container-engine/containerd/tasks/main.yml
@@ -141,3 +141,9 @@
     daemon_reload: yes
     enabled: yes
     state: started
+
+- name: Remove duplicate <none>:<none> tagged images
+  command: "nerdctl rmi $(nerdctl images -q --filter dangling=true)"
+  when: container_manager == "containerd"
+  ignore_errors: yes
+