diff --git a/Dockerfile b/Dockerfile
index e404320ef8..9e85457301 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # When rebasing to new Fedora, also update openshift/release:
 # https://github.com/openshift/release/tree/master/ci-operator/config/coreos/coreos-assembler/coreos-coreos-assembler-main.yaml
-FROM quay.io/fedora/fedora:39
+FROM quay.io/fedora/fedora:40
 WORKDIR /root/containerbuild
 
 # Keep this Dockerfile idempotent for local development rebuild use cases.
diff --git a/build.sh b/build.sh
index ffe9ee79d7..6f13a326ab 100755
--- a/build.sh
+++ b/build.sh
@@ -45,7 +45,7 @@ install_rpms() {
     frozendeps=""
 
     # We freeze the version for now since we're carrying patches.
-    frozendeps+=" $(echo osbuild{,-ostree,-selinux,-tools}-114-1.fc39.noarch)"
+    frozendeps+=" $(echo osbuild{,-ostree,-selinux,-tools}-114-1.fc40.noarch)"
 
     # First, a general update; this is best practice.  We also hit an issue recently
     # where qemu implicitly depended on an updated libusbx but didn't have a versioned
diff --git a/tests/containers/tang/Containerfile b/tests/containers/tang/Containerfile
index a0d91a2243..f36fe9132c 100644
--- a/tests/containers/tang/Containerfile
+++ b/tests/containers/tang/Containerfile
@@ -1,8 +1,8 @@
-FROM registry.fedoraproject.org/fedora-minimal:39
+FROM registry.fedoraproject.org/fedora-minimal:40
 
 RUN microdnf -y install tang && microdnf clean all && rm -rf /var/cache/yum
 EXPOSE 80
 
 RUN systemctl enable tangd.socket
 
-CMD ["/sbin/init"]
\ No newline at end of file
+CMD ["/sbin/init"]