diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml
index 85abbaedb4..66612ced81 100644
--- a/.github/workflows/linux_server_build.yml
+++ b/.github/workflows/linux_server_build.yml
@@ -70,16 +70,6 @@ jobs:
             arch: aarch64
             runner: linux_aarch64
 
-          - os: fedora-36
-            image: docker.io/overte/overte-server-build:0.1.3-fedora-36-amd64
-            arch: amd64
-            runner: ubuntu-latest
-
-          - os: fedora-36
-            image: docker.io/overte/overte-server-build:0.1.3-fedora-36-aarch64
-            arch: aarch64
-            runner: linux_aarch64
-
           - os: fedora-37
             image: docker.io/overte/overte-server-build:0.1.3-fedora-37-amd64
             arch: amd64
@@ -90,6 +80,16 @@ jobs:
             arch: aarch64
             runner: linux_aarch64
 
+          - os: fedora-38
+            image: docker.io/overte/overte-server-build:0.1.3-fedora-38-amd64
+            arch: amd64
+            runner: ubuntu-latest
+
+          - os: fedora-38
+            image: docker.io/overte/overte-server-build:0.1.3-fedora-38-aarch64
+            arch: aarch64
+            runner: linux_aarch64
+
           - os: rockylinux-9
             image: docker.io/overte/overte-server-build:0.1.3-rockylinux-9-amd64
             arch: amd64
@@ -197,10 +197,10 @@ jobs:
         else  # RPM
           if [ "${{ matrix.os }}" == "rockylinux-9" ]; then
             echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.el9.$INSTALLER_EXT" >> $GITHUB_ENV
-          elif [ "${{ matrix.os }}" == "fedora-36" ]; then
-            echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc36.$INSTALLER_EXT" >> $GITHUB_ENV
           elif [ "${{ matrix.os }}" == "fedora-37" ]; then
             echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc37.$INSTALLER_EXT" >> $GITHUB_ENV
+          elif [ "${{ matrix.os }}" == "fedora-38" ]; then
+            echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc38.$INSTALLER_EXT" >> $GITHUB_ENV
           else
             echo "Error! ARTIFACT_PATTERN not set!"
             exit 1  # Fail
diff --git a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-36 b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-38
similarity index 93%
rename from tools/ci-scripts/rpm_package/Dockerfile_build_fedora-36
rename to tools/ci-scripts/rpm_package/Dockerfile_build_fedora-38
index 986412a69e..c582ea6164 100644
--- a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-36
+++ b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-38
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Docker file for building Overte Server
-# Example build: docker build -t overte/overte-server-build:0.1.3-fedora-36 -f Dockerfile_build_fedora-36 .
-FROM fedora:36
+# Example build: docker build -t overte/overte-server-build:0.1.3-fedora-38 -f Dockerfile_build_fedora-38 .
+FROM fedora:38
 LABEL maintainer="Julian Groß (julian.gro@overte.org)"
 LABEL description="Development image for Overte Domain server and assignment clients."