diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 726aefada..258de185f 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -157,7 +157,7 @@ packet_almalinux8-docker:
   when: on_success
 
 packet_fedora36-docker-weave:
-  stage: unit-tests
+  stage: deploy-part2
   extends: .packet_pr
   when: on_success
 
@@ -219,16 +219,16 @@ packet_oracle7-canal-ha:
   extends: .packet_pr
   when: manual
 
-packet_fedora35-docker-calico:
+packet_fedora36-docker-calico:
   stage: deploy-part2
   extends: .packet_periodic
   when: on_success
   variables:
     RESET_CHECK: "true"
 
-packet_fedora36-calico-selinux:
-  stage: unit-tests
-  extends: .packet_pr
+packet_fedora35-calico-selinux:
+  stage: deploy-part2
+  extends: .packet_periodic
   when: on_success
 
 packet_fedora35-calico-swap-selinux:
@@ -247,8 +247,8 @@ packet_almalinux8-calico-nodelocaldns-secondary:
   when: manual
 
 packet_fedora36-kube-ovn:
-  stage: unit-tests
-  extends: .packet_pr
+  stage: deploy-part2
+  extends: .packet_periodic
   when: on_success
 
 # ### PR JOBS PART3
diff --git a/docs/ci.md b/docs/ci.md
index 0667351a7..195a0b05d 100644
--- a/docs/ci.md
+++ b/docs/ci.md
@@ -13,7 +13,7 @@ debian10 |  :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | :x: | :x
 debian11 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian9 |  :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: |
 fedora35 |  :white_check_mark: | :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: |
-fedora36 |  :white_check_mark: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
+fedora36 |  :x: | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | :x: |
 opensuse |  :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
 oracle7 |  :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: |
 rockylinux8 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
@@ -52,8 +52,8 @@ centos7 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian10 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian11 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 debian9 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-fedora35 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
-fedora36 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
+fedora35 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
+fedora36 |  :white_check_mark: | :x: | :x: | :x: | :x: | :x: | :x: | :white_check_mark: |
 opensuse |  :x: | :x: | :white_check_mark: | :x: | :x: | :x: | :x: | :x: |
 oracle7 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
 rockylinux8 |  :x: | :x: | :x: | :x: | :x: | :x: | :x: | :x: |
diff --git a/tests/files/packet_fedora36-calico-selinux.yml b/tests/files/packet_fedora35-calico-selinux.yml
similarity index 96%
rename from tests/files/packet_fedora36-calico-selinux.yml
rename to tests/files/packet_fedora35-calico-selinux.yml
index 55a207f88..62b1b13d9 100644
--- a/tests/files/packet_fedora36-calico-selinux.yml
+++ b/tests/files/packet_fedora35-calico-selinux.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: fedora-36
+cloud_image: fedora-35
 mode: default
 
 # Kubespray settings
diff --git a/tests/files/packet_fedora35-docker-calico.yml b/tests/files/packet_fedora36-docker-calico.yml
similarity index 96%
rename from tests/files/packet_fedora35-docker-calico.yml
rename to tests/files/packet_fedora36-docker-calico.yml
index 4542b6a6c..14ea6689a 100644
--- a/tests/files/packet_fedora35-docker-calico.yml
+++ b/tests/files/packet_fedora36-docker-calico.yml
@@ -1,6 +1,6 @@
 ---
 # Instance settings
-cloud_image: fedora-35
+cloud_image: fedora-36
 mode: default
 
 # Kubespray settings