diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml
index ccab2485ae..ee21d0a21f 100644
--- a/.github/workflows/linux_server_build.yml
+++ b/.github/workflows/linux_server_build.yml
@@ -75,6 +75,16 @@ jobs:
             arch: aarch64
             runner: linux_aarch64
 
+          - os: fedora-39
+            image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64
+            arch: amd64
+            runner: linux_amd64
+
+          - os: fedora-39
+            image: docker.io/overte/overte-server-build:0.1.4-fedora-39-aarch64
+            arch: aarch64
+            runner: linux_aarch64
+
           - os: rockylinux-9
             image: docker.io/overte/overte-server-build:0.1.3-rockylinux-9-amd64
             arch: amd64
@@ -184,6 +194,8 @@ jobs:
             echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.el9.$INSTALLER_EXT" >> $GITHUB_ENV
           elif [ "${{ matrix.os }}" == "fedora-38" ]; then
             echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc38.$INSTALLER_EXT" >> $GITHUB_ENV
+          elif [ "${{ matrix.os }}" == "fedora-39" ]; then
+            echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc39.$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-39 b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-39
new file mode 100644
index 0000000000..ef5ef24819
--- /dev/null
+++ b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-39
@@ -0,0 +1,20 @@
+# Copyright 2022-2024 Overte e.V.
+# SPDX-License-Identifier: Apache-2.0
+
+# Docker file for building Overte Server
+# Example build: docker build -t overte/overte-server-build:0.1.4-fedora-39 -f Dockerfile_build_fedora-39 .
+FROM fedora:39
+LABEL maintainer="Julian Groß (julian.gro@overte.org)"
+LABEL description="Development image for Overte Domain server and assignment clients."
+
+# Install Overte domain-server and assignment-client build dependencies
+RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3.11
+
+# Install additional build tools
+RUN dnf -y install zip unzip
+
+# Install tools for package creation
+RUN dnf -y install chrpath rpmdevtools
+
+# Install tools needed for our Github Actions Workflow
+Run dnf -y install python3-boto3 python3-pygithub