diff --git a/playbooks/fedora-30/setup-rpm-env.yaml b/playbooks/fedora-30/setup-rpm-env.yaml
index a54a102b2..6abab4126 100644
--- a/playbooks/fedora-30/setup-rpm-env.yaml
+++ b/playbooks/fedora-30/setup-rpm-env.yaml
@@ -20,3 +20,5 @@
 
     - name: Check versions of crucial packages
       command: rpm -q podman runc conmon fuse-overlayfs flatpak-session-helper
+
+    - include_tasks: ../pre-common.yaml
diff --git a/playbooks/fedora-31/setup-rpm-env.yaml b/playbooks/fedora-31/setup-rpm-env.yaml
index 8c85fbc1e..f9928795a 100644
--- a/playbooks/fedora-31/setup-rpm-env.yaml
+++ b/playbooks/fedora-31/setup-rpm-env.yaml
@@ -20,3 +20,5 @@
 
     - name: Check versions of crucial packages
       command: rpm -q podman crun conmon fuse-overlayfs flatpak-session-helper
+
+    - include_tasks: ../pre-common.yaml
diff --git a/playbooks/fedora-rawhide/setup-rpm-env.yaml b/playbooks/fedora-rawhide/setup-rpm-env.yaml
index 9a9c3799c..1d45d27bb 100644
--- a/playbooks/fedora-rawhide/setup-rpm-env.yaml
+++ b/playbooks/fedora-rawhide/setup-rpm-env.yaml
@@ -21,3 +21,5 @@
 
     - name: Check versions of crucial packages
       command: rpm -q podman crun conmon fuse-overlayfs flatpak-session-helper
+
+    - include_tasks: ../pre-common.yaml
diff --git a/playbooks/pre-common.yaml b/playbooks/pre-common.yaml
new file mode 100644
index 000000000..a545d3f2f
--- /dev/null
+++ b/playbooks/pre-common.yaml
@@ -0,0 +1,6 @@
+- name: Load registry image in pre-phase and auto restart when registry is flaky
+  command: podman pull registry.fedoraproject.org/f31/fedora-toolbox:31
+  register: _podman
+  until: _podman.rc == 0
+  retries: 5
+  delay: 10