diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 79a72939c2..be8b4a0829 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -50,7 +50,9 @@ jobs:
                      [rockylinux8, 'linux/amd64,linux/arm64', 'rockylinux:8'],
                      [rockylinux9, 'linux/amd64,linux/arm64', 'rockylinux:9'],
                      [fedora37, 'linux/amd64,linux/arm64,linux/ppc64le', 'fedora:37'],
-                     [fedora38, 'linux/amd64,linux/arm64,linux/ppc64le', 'fedora:38']]
+                     [fedora38, 'linux/amd64,linux/arm64,linux/ppc64le', 'fedora:38'],
+                     [fedora39, 'linux/amd64,linux/arm64,linux/ppc64le', 'fedora:39'],
+                     [fedora40, 'linux/amd64,linux/arm64,linux/ppc64le', 'fedora:40']]
     name: Build ${{ matrix.dockerfile[0] }}
     if: github.repository == 'spack/spack'
     steps:
diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst
index 50d96f6537..25ad22525e 100644
--- a/lib/spack/docs/containers.rst
+++ b/lib/spack/docs/containers.rst
@@ -233,6 +233,12 @@ The OS that are currently supported are summarized in the table below:
    * - Fedora Linux 38
      - ``fedora:38``
      - ``spack/fedora38``
+   * - Fedora Linux 39
+     - ``fedora:39``
+     - ``spack/fedora39``
+   * - Fedora Linux 40
+     - ``fedora:40``
+     - ``spack/fedora40``
 
 
 
diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json
index b78b180333..e91f369547 100644
--- a/lib/spack/spack/container/images.json
+++ b/lib/spack/spack/container/images.json
@@ -12,9 +12,31 @@
       },
       "os_package_manager": "yum_amazon"
     },
+    "fedora:40": {
+      "bootstrap": {
+        "template": "container/fedora.dockerfile",
+        "image": "docker.io/fedora:40"
+      },
+      "os_package_manager": "dnf",
+      "build": "spack/fedora40",
+      "final": {
+        "image": "docker.io/fedora:40"
+      }
+    },
+    "fedora:39": {
+      "bootstrap": {
+        "template": "container/fedora.dockerfile",
+        "image": "docker.io/fedora:39"
+      },
+      "os_package_manager": "dnf",
+      "build": "spack/fedora39",
+      "final": {
+        "image": "docker.io/fedora:39"
+      }
+    },
     "fedora:38": {
       "bootstrap": {
-        "template": "container/fedora_38.dockerfile",
+        "template": "container/fedora.dockerfile",
         "image": "docker.io/fedora:38"
       },
       "os_package_manager": "dnf",
@@ -25,7 +47,7 @@
     },
     "fedora:37": {
       "bootstrap": {
-        "template": "container/fedora_37.dockerfile",
+        "template": "container/fedora.dockerfile",
         "image": "docker.io/fedora:37"
       },
       "os_package_manager": "dnf",
diff --git a/share/spack/templates/container/fedora_38.dockerfile b/share/spack/templates/container/fedora.dockerfile
similarity index 100%
rename from share/spack/templates/container/fedora_38.dockerfile
rename to share/spack/templates/container/fedora.dockerfile
diff --git a/share/spack/templates/container/fedora_37.dockerfile b/share/spack/templates/container/fedora_37.dockerfile
deleted file mode 100644
index 6cea1e0cd3..0000000000
--- a/share/spack/templates/container/fedora_37.dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "container/bootstrap-base.dockerfile" %}
-{% block install_os_packages %}
-RUN dnf update -y \
- && dnf install -y \
-        bzip2 \
-        curl \
-        file \
-        findutils \
-        gcc-c++ \
-        gcc \
-        gcc-gfortran \
-        git \
-        gnupg2 \
-        hg \
-        hostname \
-        iproute \
-        make \
-        patch \
-        python3 \
-        python3-pip \
-        python3-setuptools \
-        svn \
-        unzip \
-        zstd \
-        xz \
- && pip3 install boto3 \
- && rm -rf /var/cache/dnf \
- && dnf clean all
-{% endblock %}