diff --git a/Dockerfile.build b/Dockerfile.build
index 7ef136781..72dc4a1d8 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM fedora@sha256:486fd5578f93fbc57a519e34ad4b7cac927c3f8a95409baedf0c19e9f287c207 as build
+FROM fedora:36@sha256:455fec9590de794fbc21f61dbc7e90bf9918b58492d2a03fa269c09db47b43f6 as build
 
 RUN dnf -y update && \
     dnf -y install @development-tools pkg-config iproute iputils wget git jq openssl-devel cryptsetup-libs cryptsetup-devel && \
diff --git a/access_manager/Dockerfile b/access_manager/Dockerfile
index 65a96a390..10918d22a 100644
--- a/access_manager/Dockerfile
+++ b/access_manager/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora@sha256:486fd5578f93fbc57a519e34ad4b7cac927c3f8a95409baedf0c19e9f287c207 as build
+FROM fedora:36@sha256:455fec9590de794fbc21f61dbc7e90bf9918b58492d2a03fa269c09db47b43f6 as build
 
 RUN dnf -y update && \
     dnf -y install @development-tools pkg-config iproute iputils wget git jq openssl-devel cryptsetup-libs cryptsetup-devel && \
diff --git a/cli/internal/libvirt/Dockerfile b/cli/internal/libvirt/Dockerfile
index 05764c80d..2a0983f08 100644
--- a/cli/internal/libvirt/Dockerfile
+++ b/cli/internal/libvirt/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora@sha256:486fd5578f93fbc57a519e34ad4b7cac927c3f8a95409baedf0c19e9f287c207 AS deploy
+FROM fedora:36@sha256:455fec9590de794fbc21f61dbc7e90bf9918b58492d2a03fa269c09db47b43f6 AS deploy
 RUN dnf -y update && \
     dnf -y install dnf-plugins-core \
         libvirt-daemon-config-network \
diff --git a/hack/qemu-metadata-api/Dockerfile b/hack/qemu-metadata-api/Dockerfile
index f9a058ab9..97b6fa516 100644
--- a/hack/qemu-metadata-api/Dockerfile
+++ b/hack/qemu-metadata-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:36@sha256:486fd5578f93fbc57a519e34ad4b7cac927c3f8a95409baedf0c19e9f287c207 as build
+FROM fedora:36@sha256:455fec9590de794fbc21f61dbc7e90bf9918b58492d2a03fa269c09db47b43f6 as build
 
 RUN dnf -y update && \
     dnf -y install libvirt-devel @development-tools pkg-config wget git && \
@@ -24,7 +24,7 @@ COPY . /qemu-metadata-api
 WORKDIR /qemu-metadata-api/hack/qemu-metadata-api
 RUN go build -o api-server ./main.go
 
-FROM fedora:36@sha256:486fd5578f93fbc57a519e34ad4b7cac927c3f8a95409baedf0c19e9f287c207 as release
+FROM fedora:36@sha256:455fec9590de794fbc21f61dbc7e90bf9918b58492d2a03fa269c09db47b43f6 as release
 RUN  dnf -y install libvirt-devel && \
     dnf clean all
 COPY --from=build /qemu-metadata-api/hack/qemu-metadata-api/api-server /server
diff --git a/joinservice/Dockerfile b/joinservice/Dockerfile
index 338182430..a990135f2 100644
--- a/joinservice/Dockerfile
+++ b/joinservice/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora@sha256:486fd5578f93fbc57a519e34ad4b7cac927c3f8a95409baedf0c19e9f287c207 as build
+FROM fedora:36@sha256:455fec9590de794fbc21f61dbc7e90bf9918b58492d2a03fa269c09db47b43f6 as build
 
 RUN dnf -y update && \
     dnf install -y iproute iputils wget git && \
diff --git a/kms/Dockerfile b/kms/Dockerfile
index 2f57c2b51..08358e9c8 100644
--- a/kms/Dockerfile
+++ b/kms/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora@sha256:486fd5578f93fbc57a519e34ad4b7cac927c3f8a95409baedf0c19e9f287c207 as build
+FROM fedora:36@sha256:455fec9590de794fbc21f61dbc7e90bf9918b58492d2a03fa269c09db47b43f6 as build
 
 RUN dnf -y update && \
     dnf install -y wget git
diff --git a/verify/Dockerfile b/verify/Dockerfile
index 03c607487..24555a791 100644
--- a/verify/Dockerfile
+++ b/verify/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora@sha256:486fd5578f93fbc57a519e34ad4b7cac927c3f8a95409baedf0c19e9f287c207 as build
+FROM fedora:36@sha256:455fec9590de794fbc21f61dbc7e90bf9918b58492d2a03fa269c09db47b43f6 as build
 
 RUN dnf -y update && \
     dnf install -y iproute iputils wget git && \