diff --git a/Makefile b/Makefile
index 08b3bd6f..2b39eb17 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 # Same as ones in docker-bake.hcl
 DISTROS_DEB ?= debian11 debian12 debian13 ubuntu2204 ubuntu2404 raspbian11 raspbian12
-DISTROS_RPM ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9
+DISTROS_RPM ?= centos9 fedora41 fedora42 oraclelinux8 oraclelinux9
 DISTROS_STATIC ?= static
 DISTROS ?= $(DISTROS_DEB) $(DISTROS_RPM) $(DISTROS_STATIC)
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 39f208a2..bb33955a 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -24,9 +24,8 @@ variable "DISTROS" {
     "ubuntu2204",
     "ubuntu2404",
     "centos9",
-    "fedora37",
-    "fedora38",
-    "fedora39",
+    "fedora41",
+    "fedora42",
     "oraclelinux8",
     "oraclelinux9"
   ]
@@ -255,36 +254,25 @@ target "_distro-centos9" {
   }
 }
 
-target "_distro-fedora37" {
+target "_distro-fedora41" {
   args = {
-    DISTRO_NAME = "fedora37"
+    DISTRO_NAME = "fedora41"
     DISTRO_TYPE = "rpm"
     DISTRO_RELEASE = "fedora"
-    DISTRO_ID = "37"
-    DISTRO_SUITE = "37"
-    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:37"
+    DISTRO_ID = "41"
+    DISTRO_SUITE = "41"
+    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:41"
   }
 }
 
-target "_distro-fedora38" {
+target "_distro-fedora42" {
   args = {
-    DISTRO_NAME = "fedora38"
+    DISTRO_NAME = "fedora42"
     DISTRO_TYPE = "rpm"
     DISTRO_RELEASE = "fedora"
-    DISTRO_ID = "38"
-    DISTRO_SUITE = "38"
-    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:38"
-  }
-}
-
-target "_distro-fedora39" {
-  args = {
-    DISTRO_NAME = "fedora39"
-    DISTRO_TYPE = "rpm"
-    DISTRO_RELEASE = "fedora"
-    DISTRO_ID = "39"
-    DISTRO_SUITE = "39"
-    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:39"
+    DISTRO_ID = "42"
+    DISTRO_SUITE = "42"
+    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:42"
   }
 }
 
@@ -329,9 +317,8 @@ function "distroPlatforms" {
         ubuntu2204 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/s390x"]
         ubuntu2404 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
         centos9 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
-        fedora37 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
-        fedora38 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
-        fedora39 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
+        fedora41 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
+        fedora42 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         oraclelinux8 = ["linux/amd64", "linux/arm64"]
         oraclelinux9 = ["linux/amd64", "linux/arm64"]
       }, distro, []),