diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 203387eab89..46f463e84c4 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -92,7 +92,7 @@ packet_debian10-containerd:
     MITOGEN_ENABLE: "true"
 
 packet_centos7-calico-ha-once-localhost:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
   when: on_success
   variables:
@@ -102,100 +102,100 @@ packet_centos7-calico-ha-once-localhost:
     - docker:19.03.9-dind
 
 packet_centos8-kube-ovn:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part2
+  extends: .packet_periodic
   when: on_success
 
 packet_centos8-calico:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
   when: on_success
 
 packet_fedora34-weave:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
   when: on_success
 
 packet_opensuse-canal:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part2
+  extends: .packet_periodic
   when: on_success
 
 packet_ubuntu18-ovn4nfv:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part2
+  extends: .packet_periodic
   when: on_success
 
 # ### MANUAL JOBS
 
 packet_ubuntu16-weave-sep:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_ubuntu18-cilium-sep:
-  stage: deploy-part1
+  stage: deploy-special
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_ubuntu18-flannel-containerd-ha:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_ubuntu18-flannel-containerd-ha-once:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_debian9-macvlan:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_centos7-calico-ha:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_centos7-kube-router:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_centos7-multus-calico:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_oracle7-canal-ha:
   stage: unit-tests
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_fedora33-calico:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part2
+  extends: .packet_periodic
   when: on_success
   variables:
     MITOGEN_ENABLE: "true"
 
 packet_amazon-linux-2-aio:
-  stage: deploy-part1
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
 
 packet_fedora34-kube-ovn-containerd:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part2
+  extends: .packet_periodic
   when: on_success
 
 # ### PR JOBS PART3
 # Long jobs (45min+)
 
 packet_centos7-weave-upgrade-ha:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part3
+  extends: .packet_periodic
   when: on_success
   variables:
     UPGRADE_TEST: basic
@@ -203,14 +203,14 @@ packet_centos7-weave-upgrade-ha:
 
 # Calico HA Wireguard
 packet_ubuntu20-calico-ha-wireguard:
-  stage: unit-tests
+  stage: deploy-part2
   extends: .packet_pr
-  when: on_success
+  when: manual
   variables:
     MITOGEN_ENABLE: "true"
 
 packet_debian9-calico-upgrade:
-  stage: deploy-part1
+  stage: deploy-part3
   extends: .packet_pr
   when: on_success
   variables:
@@ -218,24 +218,24 @@ packet_debian9-calico-upgrade:
     MITOGEN_ENABLE: "false"
 
 packet_debian9-calico-upgrade-once:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part3
+  extends: .packet_periodic
   when: on_success
   variables:
     UPGRADE_TEST: graceful
     MITOGEN_ENABLE: "false"
 
 packet_ubuntu18-calico-ha-recover:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part3
+  extends: .packet_periodic
   when: on_success
   variables:
     RECOVER_CONTROL_PLANE_TEST: "true"
     RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:],kube_control_plane[1:]"
 
 packet_ubuntu18-calico-ha-recover-noquorum:
-  stage: deploy-part1
-  extends: .packet_pr
+  stage: deploy-part3
+  extends: .packet_periodic
   when: on_success
   variables:
     RECOVER_CONTROL_PLANE_TEST: "true"
diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml
index fb58711bf54..1b9392d3177 100644
--- a/roles/container-engine/docker/tasks/main.yml
+++ b/roles/container-engine/docker/tasks/main.yml
@@ -112,7 +112,7 @@
     dnf:
       enablerepo: "{{ docker_package_info.enablerepo | default(omit) }}"
     yum:
-      enablerepo: "{{ docker_package_info.enablerepo | default(omit) }}"
+      enablerepo: "docker-ce"
     zypper:
       update_cache: true
   register: docker_task_result
@@ -126,11 +126,6 @@
     - not is_ostree
     - docker_package_info.pkgs|length > 0
 
-- name: Pause for 5 minutes to build app cache
-  pause:
-    minutes: 60
-
-
 # This is required to ensure any apt upgrade will not break kubernetes
 - name: Tell Debian hosts not to change the docker version with apt upgrade
   dpkg_selections: