diff --git a/.ci-dockerfiles/x64-64-unknown-linux-fedora39-buiilder/Dockerfile b/.ci-dockerfiles/x64-64-unknown-linux-fedora39-buiilder/Dockerfile
new file mode 100644
index 0000000000..ee47cb7096
--- /dev/null
+++ b/.ci-dockerfiles/x64-64-unknown-linux-fedora39-buiilder/Dockerfile
@@ -0,0 +1,20 @@
+FROM fedora:39
+
+RUN dnf install -y clang \
+  cmake \
+  git \
+  make \
+  zlib \
+  curl \
+  python3-pip \
+  lldb \
+  libstdc++-static \
+ && pip3 install cloudsmith-cli
+
+# needed for GitHub actions
+RUN git config --global --add safe.directory /__w/ponyc/ponyc
+
+# add user pony in order to not run tests as root
+RUN useradd -u 1001 -ms /bin/bash -d /home/pony -g root pony
+USER pony
+WORKDIR /home/pony
diff --git a/.ci-dockerfiles/x64-64-unknown-linux-fedora39-buiilder/build-and-push.bash b/.ci-dockerfiles/x64-64-unknown-linux-fedora39-buiilder/build-and-push.bash
new file mode 100644
index 0000000000..e40269f935
--- /dev/null
+++ b/.ci-dockerfiles/x64-64-unknown-linux-fedora39-buiilder/build-and-push.bash
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+
+#
+# *** You should already be logged in to GHCR when you run this ***
+#
+
+NAME="ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-fedora39-builder"
+TODAY=$(date +%Y%m%d)
+DOCKERFILE_DIR="$(dirname "$0")"
+
+docker build --pull -t "${NAME}:${TODAY}" "${DOCKERFILE_DIR}"
+docker push "${NAME}:${TODAY}"
diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml
index 3d2f7d5799..a1b3ed1ba9 100644
--- a/.github/workflows/nightlies.yml
+++ b/.github/workflows/nightlies.yml
@@ -24,6 +24,10 @@ jobs:
             name: x86-64-unknown-linux-musl
             triple-os: linux-musl
             triple-vendor: unknown
+          - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-fedora39-builder:20240128
+            name: x86-64-unknown-linux-fedora39
+            triple-os: linux-fedora39
+            triple-vendor: unknown
 
     name: ${{ matrix.name }}
     container:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9dcc2e8708..601c48abf0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,6 +47,10 @@ jobs:
             name: x86-64-unknown-linux-musl
             triple-os: linux-musl
             triple-vendor: unknown
+          - image: ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-fedora39-builder:20240128
+            name: x86-64-unknown-linux-fedora39
+            triple-os: linux-fedora39
+            triple-vendor: unknown
 
     name: ${{ matrix.name }}
     container: