diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index f6391be9..b895faf8 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -115,7 +115,7 @@
         # mirror: "http://{{ zuul_site_mirror_fqdn }}/centos"
 
 - job:
-    name: dib-nodepool-functional-openstack-fedora-35-containerfile-src
+    name: dib-nodepool-functional-openstack-fedora-36-containerfile-src
     description: |
       Test building and booting an Fedora image from a
       containerfile with Nodepool and OpenStack (using released
@@ -124,8 +124,8 @@
     vars:
       nodepool_debug: true
       nodepool_diskimage:
-        base_element: fedora-container
-        release: '35'
+        base_element : fedora-container
+        release: '36'
 
 - job:
     name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 3892bcf1..1dcd0f9b 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -17,7 +17,7 @@
         - dib-nodepool-functional-openstack-centos-7-src
         - dib-nodepool-functional-openstack-centos-8-stream-src
         - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-fedora-35-containerfile-src
+        - dib-nodepool-functional-openstack-fedora-36-containerfile-src
         - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src:
             voting: false
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
@@ -50,7 +50,7 @@
         - dib-nodepool-functional-openstack-centos-7-src
         - dib-nodepool-functional-openstack-centos-8-stream-src
         - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-fedora-35-containerfile-src
+        - dib-nodepool-functional-openstack-fedora-36-containerfile-src
         - dib-nodepool-functional-openstack-ubuntu-xenial-src
         - dib-nodepool-functional-openstack-ubuntu-bionic-src
         - dib-nodepool-functional-openstack-ubuntu-focal-src
diff --git a/diskimage_builder/elements/fedora-container/containerfiles/36 b/diskimage_builder/elements/fedora-container/containerfiles/36
new file mode 100644
index 00000000..b17df72e
--- /dev/null
+++ b/diskimage_builder/elements/fedora-container/containerfiles/36
@@ -0,0 +1,3 @@
+FROM docker.io/library/fedora:36
+
+RUN dnf install -y findutils util-linux
diff --git a/diskimage_builder/elements/fedora/README.rst b/diskimage_builder/elements/fedora/README.rst
index 689c35ba..24ac87d5 100644
--- a/diskimage_builder/elements/fedora/README.rst
+++ b/diskimage_builder/elements/fedora/README.rst
@@ -10,7 +10,7 @@ Releases
 
 This element targets the current and previous version of Fedora; these
 values clearly changes over time.  To fix the version set the
-`DIB_RELEASE` variable to the Fedora version (e.g. ``35``).  The
+`DIB_RELEASE` variable to the Fedora version (e.g. ``36``).  The
 default value is the current best supported version (i.e. it may
 change upward at any given release to support the next Fedora).
 
diff --git a/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
index 3d88a9a5..78f0337e 100644
--- a/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
+++ b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
@@ -1,4 +1,4 @@
 export DISTRO_NAME=fedora
-export DIB_RELEASE=${DIB_RELEASE:-35}
+export DIB_RELEASE=${DIB_RELEASE:-36}
 export EFI_BOOT_DIR="EFI/fedora"