diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index bb3b6feb879..6357dfca36f 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -36,137 +36,119 @@ packet_ubuntu18-crio:
   variables:
     MITOGEN_ENABLE: "true"
 
-# ### MANUAL JOBS
-
-packet_centos7-weave-upgrade-ha:
-  stage: deploy-part3
-  extends: .packet
-  when: on_success
-  variables:
-    UPGRADE_TEST: basic
-    MITOGEN_ENABLE: "false"
-
-packet_ubuntu16-weave-sep:
+packet_ubuntu16-canal-kubeadm-ha:
   stage: deploy-part2
   extends: .packet
-  when: manual
-
-# # More builds for PRs/merges (manual) and triggers (auto)
+  when: on_success
 
 packet_ubuntu16-canal-sep:
   stage: deploy-special
   extends: .packet
   when: manual
 
-packet_ubuntu16-canal-kubeadm-ha:
-  stage: deploy-part2
-  extends: .packet
-  when: on_success
-
 packet_ubuntu16-flannel-ha:
   stage: deploy-part2
   extends: .packet
   when: manual
 
-# Contiv does not work in k8s v1.16
-# packet_ubuntu16-contiv-sep:
-#   stage: deploy-part2
-#   extends: .packet
-#   when: on_success
-
-packet_ubuntu18-cilium-sep:
-  stage: deploy-special
-  extends: .packet
-  when: manual
-
-packet_ubuntu18-flannel-containerd-ha:
+packet_ubuntu16-kube-router-sep:
   stage: deploy-part2
   extends: .packet
   when: manual
 
-packet_ubuntu18-flannel-containerd-ha-once:
+packet_debian10-containerd:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
+  variables:
+    MITOGEN_ENABLE: "true"
 
-packet_debian9-macvlan:
+packet_centos7-calico-ha-once-localhost:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
+  services:
+    - docker:18.09.9-dind
 
-packet_debian9-calico-upgrade-once:
-  stage: deploy-part3
+packet_centos8-kube-ovn:
+  stage: deploy-part2
   extends: .packet
   when: on_success
-  variables:
-    UPGRADE_TEST: graceful
-    MITOGEN_ENABLE: "false"
 
-packet_debian10-containerd:
+packet_centos8-calico:
   stage: deploy-part2
   extends: .packet
   when: on_success
-  variables:
-    MITOGEN_ENABLE: "true"
 
-packet_centos7-calico-ha:
+packet_fedora30-weave:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
 
-packet_centos7-calico-ha-once-localhost:
+packet_opensuse-canal:
   stage: deploy-part2
   extends: .packet
   when: on_success
-  services:
-    - docker:18.09.9-dind
 
-packet_centos8-kube-ovn:
+# Contiv does not work in k8s v1.16
+# packet_ubuntu16-contiv-sep:
+#   stage: deploy-part2
+#   extends: .packet
+#   when: on_success
+
+# ### MANUAL JOBS
+
+packet_ubuntu16-weave-sep:
   stage: deploy-part2
   extends: .packet
-  when: on_success
+  when: manual
 
-packet_fedora30-weave:
+packet_ubuntu18-cilium-sep:
+  stage: deploy-special
+  extends: .packet
+  when: manual
+
+packet_ubuntu18-flannel-containerd-ha:
   stage: deploy-part2
   extends: .packet
-  when: on_success
+  when: manual
 
-packet_fedora31-flannel:
+packet_ubuntu18-flannel-containerd-ha-once:
   stage: deploy-part2
   extends: .packet
-  when: on_success
-  variables:
-    MITOGEN_ENABLE: "true"
+  when: manual
 
-packet_centos7-kube-router:
+packet_debian9-macvlan:
   stage: deploy-part2
   extends: .packet
   when: manual
 
-packet_centos7-multus-calico:
+packet_centos7-calico-ha:
   stage: deploy-part2
   extends: .packet
   when: manual
 
-packet_centos8-calico:
+packet_centos7-kube-router:
   stage: deploy-part2
   extends: .packet
-  when: on_success
+  when: manual
 
-packet_opensuse-canal:
+packet_centos7-multus-calico:
   stage: deploy-part2
   extends: .packet
-  when: on_success
+  when: manual
 
 packet_oracle7-canal-ha:
   stage: deploy-part2
   extends: .packet
   when: manual
 
-packet_ubuntu16-kube-router-sep:
+packet_fedora31-flannel:
   stage: deploy-part2
   extends: .packet
-  when: manual
+  when: on_success
+  variables:
+    MITOGEN_ENABLE: "true"
 
 packet_amazon-linux-2-aio:
   stage: deploy-part2
@@ -176,6 +158,14 @@ packet_amazon-linux-2-aio:
 # ### PR JOBS PART3
 # Long jobs (45min+)
 
+packet_centos7-weave-upgrade-ha:
+  stage: deploy-part3
+  extends: .packet
+  when: on_success
+  variables:
+    UPGRADE_TEST: basic
+    MITOGEN_ENABLE: "false"
+
 packet_debian9-calico-upgrade:
   stage: deploy-part3
   extends: .packet
@@ -184,6 +174,14 @@ packet_debian9-calico-upgrade:
     UPGRADE_TEST: graceful
     MITOGEN_ENABLE: "false"
 
+packet_debian9-calico-upgrade-once:
+  stage: deploy-part3
+  extends: .packet
+  when: on_success
+  variables:
+    UPGRADE_TEST: graceful
+    MITOGEN_ENABLE: "false"
+
 packet_ubuntu18-calico-ha-recover:
   stage: deploy-part3
   extends: .packet