diff --git a/Makefile b/Makefile
index 1f4f6ab..7e14efd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PLATFORMS := ubuntu-2004 ubuntu-2204 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-154 opensuse-155 fedora-37 fedora-38
+PLATFORMS := ubuntu-2004 ubuntu-2204 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-154 opensuse-155 fedora-38 fedora-39
 SLS_BINARY ?= ./node_modules/serverless/bin/serverless.js
 
 deps:
diff --git a/builder/Dockerfile.fedora-37 b/builder/Dockerfile.fedora-39
similarity index 96%
rename from builder/Dockerfile.fedora-37
rename to builder/Dockerfile.fedora-39
index ed865c4..7f6306d 100644
--- a/builder/Dockerfile.fedora-37
+++ b/builder/Dockerfile.fedora-39
@@ -1,6 +1,6 @@
-FROM fedora:37
+FROM fedora:39
 
-ENV OS_IDENTIFIER fedora-37
+ENV OS_IDENTIFIER fedora-39
 
 RUN dnf -y upgrade \
     && dnf -y install dnf-plugins-core \
@@ -82,7 +82,7 @@ ENV JAVA_HOME=/usr/lib/jvm/jre-11-openjdk
 # R 3.x requires PCRE2 for Pango support on RHEL 9
 ENV INCLUDE_PCRE2_IN_R_3 yes
 
-COPY package.fedora-37 /package.sh
+COPY package.fedora-39 /package.sh
 COPY build.sh .
 COPY patches /patches
 ENTRYPOINT ./build.sh
diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml
index 883422a..35244f9 100644
--- a/builder/docker-compose.yml
+++ b/builder/docker-compose.yml
@@ -119,18 +119,6 @@ services:
     image: r-builds:opensuse-154
     volumes:
       - ./integration/tmp:/tmp/output
-  fedora-37:
-    command: ./build.sh
-    environment:
-      - R_VERSION=${R_VERSION}
-      - R_INSTALL_PATH=${R_INSTALL_PATH}
-      - LOCAL_STORE=/tmp/output
-    build:
-      context: .
-      dockerfile: Dockerfile.fedora-37
-    image: r-builds:fedora-37
-    volumes:
-      - ./integration/tmp:/tmp/output
   fedora-38:
     command: ./build.sh
     environment:
@@ -143,3 +131,15 @@ services:
     image: r-builds:fedora-38
     volumes:
       - ./integration/tmp:/tmp/output
+  fedora-39:
+    command: ./build.sh
+    environment:
+      - R_VERSION=${R_VERSION}
+      - R_INSTALL_PATH=${R_INSTALL_PATH}
+      - LOCAL_STORE=/tmp/output
+    build:
+      context: .
+      dockerfile: Dockerfile.fedora-39
+    image: r-builds:fedora-39
+    volumes:
+      - ./integration/tmp:/tmp/output
diff --git a/builder/package.fedora-37 b/builder/package.fedora-39
similarity index 100%
rename from builder/package.fedora-37
rename to builder/package.fedora-39
diff --git a/serverless-resources.yml b/serverless-resources.yml
index 43fc685..235ec85 100644
--- a/serverless-resources.yml
+++ b/serverless-resources.yml
@@ -269,20 +269,6 @@ rBuildsBatchJobDefinitionOpensuse154:
       Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:opensuse-154"
     Timeout:
       AttemptDurationSeconds: 7200
-rBuildsBatchJobDefinitionFedora37:
-  Type: AWS::Batch::JobDefinition
-  Properties:
-    Type: container
-    ContainerProperties:
-      Command:
-        - ./build.sh
-      Vcpus: 4
-      Memory: 4096
-      JobRoleArn:
-        "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ]
-      Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:fedora-37"
-    Timeout:
-      AttemptDurationSeconds: 7200
 rBuildsBatchJobDefinitionFedora38:
   Type: AWS::Batch::JobDefinition
   Properties:
@@ -297,6 +283,20 @@ rBuildsBatchJobDefinitionFedora38:
       Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:fedora-38"
     Timeout:
       AttemptDurationSeconds: 7200
+rBuildsBatchJobDefinitionFedora39:
+  Type: AWS::Batch::JobDefinition
+  Properties:
+    Type: container
+    ContainerProperties:
+      Command:
+        - ./build.sh
+      Vcpus: 4
+      Memory: 4096
+      JobRoleArn:
+        "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ]
+      Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:fedora-39"
+    Timeout:
+      AttemptDurationSeconds: 7200
 
 # step function cloudwatch event trigger resources
 rBuildsEventRuleIamRole:
diff --git a/serverless.yml b/serverless.yml
index 7f7fef2..824c358 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -75,11 +75,11 @@ provider:
       Ref: rBuildsBatchJobDefinitionOpensuse155
     JOB_DEFINITION_ARN_opensuse_154:
       Ref: rBuildsBatchJobDefinitionOpensuse154
-    JOB_DEFINITION_ARN_fedora_37:
-      Ref: rBuildsBatchJobDefinitionFedora37
     JOB_DEFINITION_ARN_fedora_38:
       Ref: rBuildsBatchJobDefinitionFedora38
-    SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-154,opensuse-155,fedora-37,fedora-38
+    JOB_DEFINITION_ARN_fedora_39:
+      Ref: rBuildsBatchJobDefinitionFedora39
+    SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-154,opensuse-155,fedora-38,fedora-39
 
 functions:
   queueBuilds:
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index 764167f..d86944d 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -79,14 +79,6 @@ services:
       - R_VERSION=${R_VERSION}
     volumes:
       - ../:/r-builds
-  fedora-37:
-    image: fedora:37
-    command: /r-builds/test/test-yum.sh
-    environment:
-      - OS_IDENTIFIER=fedora-37
-      - R_VERSION=${R_VERSION}
-    volumes:
-      - ../:/r-builds
   fedora-38:
     image: fedora:38
     command: /r-builds/test/test-yum.sh
@@ -95,3 +87,11 @@ services:
       - R_VERSION=${R_VERSION}
     volumes:
       - ../:/r-builds
+  fedora-39:
+    image: fedora:39
+    command: /r-builds/test/test-yum.sh
+    environment:
+      - OS_IDENTIFIER=fedora-39
+      - R_VERSION=${R_VERSION}
+    volumes:
+      - ../:/r-builds