diff --git a/images/demo/Dockerfile b/images/demo/Dockerfile
index cc6d45c4188edafb434bc635300d2a3a725041a0..fc8df6a4578fe89aa3dc72dcfd1906eb5a10f98a 100644
--- a/images/demo/Dockerfile
+++ b/images/demo/Dockerfile
@@ -1,3 +1,3 @@
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:36
 
 RUN echo "Hello world"
diff --git a/images/koolbox/Dockerfile b/images/koolbox/Dockerfile
index 3238dd0846a01e488af04097d6228cda0cc03329..f6e0dd32135ef2fbf1813729e2fe98639c110f94 100644
--- a/images/koolbox/Dockerfile
+++ b/images/koolbox/Dockerfile
@@ -1,5 +1,5 @@
 # kubectl CLI cache
-FROM registry.fedoraproject.org/fedora:35 as kubectl
+FROM registry.fedoraproject.org/fedora:36 as kubectl
 
 # renovate: datasource=github-releases depName=kubernetes/kubernetes
 ARG KUBECTL_VERSION=v1.24.3
@@ -24,7 +24,7 @@ FROM ghcr.io/caarlos0/svu:v1.9.0 as svu
 FROM quay.io/git-chglog/git-chglog:0.15.1 as git-chglog
 
 # Helm CLI cache
-FROM registry.fedoraproject.org/fedora:35 as helm
+FROM registry.fedoraproject.org/fedora:36 as helm
 
 # renovate: datasource=github-releases depName=helm/helm
 ARG HELM_VERSION=v3.10.0
@@ -34,7 +34,7 @@ RUN curl -L "https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz" | tar
     && install -o root -g root -m 0755 helm /usr/local/bin/helm
 
 # Flux CLI cache
-FROM registry.fedoraproject.org/fedora:35 as flux
+FROM registry.fedoraproject.org/fedora:36 as flux
 
 # renovate: datasource=github-releases depName=fluxcd/flux2
 ARG FLUX_VERSION=v0.35.0
@@ -44,7 +44,7 @@ RUN curl -L https://github.com/fluxcd/flux2/releases/download/${FLUX_VERSION}/fl
     && install -o root -g root -m 0755 flux /usr/local/bin/flux
 
 # kustomize CLI cache
-FROM registry.fedoraproject.org/fedora:35 as kustomize
+FROM registry.fedoraproject.org/fedora:36 as kustomize
 
 # renovate: datasource=github-releases depName=kubernetes-sigs/kustomize
 ARG KUSTOMIZE_VERSION=4.1.3
@@ -54,7 +54,7 @@ RUN curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/kusto
     && install -o root -g root -m 0755 kustomize /usr/local/bin/kustomize
 
 # kubeval CLI cache
-FROM registry.fedoraproject.org/fedora:35 as kubeval
+FROM registry.fedoraproject.org/fedora:36 as kubeval
 
 # renovate: datasource=github-releases depName=instrumenta/kubeval
 ARG KUBEVAL_VERSION=v0.16.1
@@ -64,7 +64,7 @@ RUN curl -L https://github.com/instrumenta/kubeval/releases/download/${KUBEVAL_V
     && install -o root -g root -m 0755 kubeval /usr/local/bin/kubeval
 
 # SOPS CLI cache
-FROM registry.fedoraproject.org/fedora:35 as sops
+FROM registry.fedoraproject.org/fedora:36 as sops
 
 # renovate: datasource=github-releases depName=mozilla/sops
 ARG SOPS_VERSION=v3.7.3
@@ -84,7 +84,7 @@ RUN curl -L https://github.com/grafana/loki/releases/download/${LOKI_VERSION}/lo
     && install -o root -g root -m 0755 logcli /usr/local/bin/logcli
 
 # yq CLI cache
-FROM registry.fedoraproject.org/fedora:35 as yq
+FROM registry.fedoraproject.org/fedora:36 as yq
 
 # renovate: datasource=github-releases depName=mikefarah/yq
 ARG YQ_VERSION=v4.27.5
@@ -93,7 +93,7 @@ ENV YQ_VERSION=${YQ_VERSION}
 RUN curl -L https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 > ./yq \
     && install -o root -g root -m 0755 yq /usr/local/bin/yq
 
-FROM registry.fedoraproject.org/fedora:35 as helm-docs
+FROM registry.fedoraproject.org/fedora:36 as helm-docs
 
 # renovate: datasource=github-releases depName=norwoodj/helm-docs
 ARG HELM_DOCS_VERSION=v1.11.0
@@ -103,7 +103,7 @@ RUN curl -L https://github.com/norwoodj/helm-docs/releases/download/${HELM_DOCS_
     && install -o root -g root -m 0755 helm-docs /usr/local/bin/helm-docs
 
 # kubectl-krew CLI cache
-FROM registry.fedoraproject.org/fedora:35 as kubectl-krew
+FROM registry.fedoraproject.org/fedora:36 as kubectl-krew
 
 # renovate: datasource=github-releases depName=kubernetes-sigs/krew
 ARG KREW_VERSION=v0.4.3
@@ -118,7 +118,7 @@ RUN set -x; mkdir -p /opt/krew; cd "/opt/krew" && \
   mv "${KREW}" /opt/krew/krew
 
 # kubectl-krew CLI cache
-FROM registry.fedoraproject.org/fedora:35 as mdbook
+FROM registry.fedoraproject.org/fedora:36 as mdbook
 
 # renovate: datasource=github-releases depName=kubernetes-sigs/krew
 ARG MDBOOK_VERSION=v0.4.18
@@ -130,7 +130,7 @@ RUN curl -L "https://github.com/rust-lang/mdBook/releases/download/${MDBOOK_VERS
 
 
 # Actual start of container build
-FROM registry.fedoraproject.org/fedora:35
+FROM registry.fedoraproject.org/fedora:36
 
 ARG MAINTAINER="unmaintained"
 LABEL maintainer=$MAINTAINER