diff --git a/base_images/gce.yml b/base_images/gce.yml
index 7d9702af..ac9ed984 100644
--- a/base_images/gce.yml
+++ b/base_images/gce.yml
@@ -29,12 +29,12 @@ variables:  # Empty value means it must be passed in on command-line
     # N/B: There are Fedora-Cloud...GCP.tar.gz images available, however
     #      as of this comment, they lack the cloud-init package which is
     #      required by GCP for startup resizing of the rootfs.
-    FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-35-1.2-x86_64-CHECKSUM"
-    FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
+    FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/36/Cloud/x86_64/images/Fedora-Cloud-36-x86_64-20220216.n.0-CHECKSUM"
+    FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/development/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-20220216.n.0.x86_64.qcow2"
 
     # Prior Fedora release
-    PRIOR_FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-34-1.2-x86_64-CHECKSUM"
-    PRIOR_FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.x86_64.qcow2"
+    PRIOR_FEDORA_CSUM_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-35-1.2-x86_64-CHECKSUM"
+    PRIOR_FEDORA_IMAGE_URL: "https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2"
 
 
 # Don't leak sensitive values in error messages / output
diff --git a/cache_images/fedora-netavark_packaging.sh b/cache_images/fedora-netavark_packaging.sh
index 7046c08c..7ef88305 100644
--- a/cache_images/fedora-netavark_packaging.sh
+++ b/cache_images/fedora-netavark_packaging.sh
@@ -58,11 +58,8 @@ INSTALL_PACKAGES=(\
     zip
 )
 
-# TODO: Remove this when all CI should test with Netavark/Aardvark by default
-EXARG="--exclude=netavark --exclude=aardvark-dns"
-
 msg "Installing general build/test dependencies"
-bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}"
+bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"
 
 msg "Installing netavark-specific toolchain dependencies"
 export CARGO_HOME="/var/cache/cargo"  # must match .cirrus.yml in netavark repo
diff --git a/cache_images/fedora-podman-py_packaging.sh b/cache_images/fedora-podman-py_packaging.sh
index e92af726..b45e76c2 100644
--- a/cache_images/fedora-podman-py_packaging.sh
+++ b/cache_images/fedora-podman-py_packaging.sh
@@ -86,11 +86,8 @@ INSTALL_PACKAGES=(\
     zstd
 )
 
-# TODO: Remove this when all CI should test with Netavark/Aardvark by default
-EXARG="--exclude=netavark --exclude=aardvark-dns"
-
 echo "Installing general build/test dependencies"
-bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}"
+bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"
 
 # It was observed in F33, dnf install doesn't always get you the latest/greatest
 lilto $SUDO dnf update -y
diff --git a/cache_images/fedora_packaging.sh b/cache_images/fedora_packaging.sh
index 3ab2622f..5af559b3 100644
--- a/cache_images/fedora_packaging.sh
+++ b/cache_images/fedora_packaging.sh
@@ -155,16 +155,12 @@ INSTALL_PACKAGES=(\
 
 # Perl module packaging changes between F32 and F33
 case "$OS_RELEASE_VER" in
-    32) INSTALL_PACKAGES+=( python3-pytoml ) ;;
-    33) ;&
-    34) ;&
-    35) INSTALL_PACKAGES+=( perl-FindBin python-toml ) ;;
+    35) EXARG="--exclude=netavark --exclude=aardvark-dns"
+        INSTALL_PACKAGES+=( perl-FindBin python-toml ) ;;
+    36) EXARG="" ;;
     *) die "Unknown/Unsupported \$OS_REL_VER '$OS_REL_VER'" ;;
 esac
 
-# TODO: Remove this when all CI should test with Netavark/Aardvark by default
-EXARG="--exclude=netavark --exclude=aardvark-dns"
-
 # When installing during a container-build, having this present
 # will seriously screw up future dnf operations in very non-obvious ways.
 if ! ((CONTAINER)); then
@@ -174,10 +170,6 @@ if ! ((CONTAINER)); then
         selinux-policy-devel
         policycoreutils
     )
-else
-    if [[ "$OS_RELEASE_VER" -lt 35 ]]; then
-        EXARG="$EXARG --exclude=selinux*"
-    fi
 fi
 
 
diff --git a/podman/fedora_release b/podman/fedora_release
index 8f92bfdd..7facc899 100644
--- a/podman/fedora_release
+++ b/podman/fedora_release
@@ -1 +1 @@
-35
+36
diff --git a/podman/prior-fedora_release b/podman/prior-fedora_release
index a7873645..8f92bfdd 100644
--- a/podman/prior-fedora_release
+++ b/podman/prior-fedora_release
@@ -1 +1 @@
-34
+35