diff --git a/.github/images/fedora-39/Dockerfile b/.github/images/fedora-39/Dockerfile
new file mode 100644
index 00000000000..4ae0940aca0
--- /dev/null
+++ b/.github/images/fedora-39/Dockerfile
@@ -0,0 +1,30 @@
+FROM fedora:39
+
+WORKDIR /souffle
+
+# Install souffle build dependencies
+RUN dnf -y install \
+    autoconf \
+    automake \
+    bash-completion \
+    bison \
+    cmake \
+    doxygen \
+    flex \
+    gcc-c++ \
+    git \
+    libffi-devel \
+    libtool \
+    make \
+    mcpp \
+    ncurses-devel \
+    pkg-config \
+    python39 \
+    rpm-build \
+    sqlite-devel \
+    zlib-devel
+
+# Copy everything into souffle directory
+COPY . .
+
+ENTRYPOINT ["/bin/bash", "-l", "-c", ".github/images/entrypoint.sh"]
diff --git a/.github/scripts/updatePPA.sh b/.github/scripts/updatePPA.sh
index d4588f3e60b..5eeb9f82379 100755
--- a/.github/scripts/updatePPA.sh
+++ b/.github/scripts/updatePPA.sh
@@ -46,17 +46,17 @@ sudo apt-get install createrepo rpm
 echo "%_gpg_name Bot\n%__gpg_sign_cmd %{__gpg} gpg --force-v3-sigs --batch --verbose --no-armor --no-secmem-warning -u \"%{_gpg_name}\" -sbo %{__signature_filename} --digest-algo sha256 %{__plaintext_filename}'" > ~/.rpmmacros
 
 ## Fedora
-mkdir -p $TMPDIR/ppa/fedora/34/x86_64
+mkdir -p $TMPDIR/ppa/fedora/39/x86_64
 cd $TMPDIR/ppa/fedora
 
-for i in $DEBPATH/*fedora-34*/*rpm
+for i in $DEBPATH/*fedora-39*/*rpm
 do
     rpm --addsign $i
 done
 
-cp $DEBPATH/*fedora-34*/*rpm 34/x86_64/
+cp $DEBPATH/*fedora-39*/*rpm 39/x86_64/
 
-createrepo 34/x86_64
+createrepo 39/x86_64
 
 git add .
 git commit -m "Added fedora rpm files for $SOUFFLE_TAG"
diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
index d81ac29ddd8..16d9b18e3dc 100644
--- a/.github/workflows/create-packages.yml
+++ b/.github/workflows/create-packages.yml
@@ -15,13 +15,9 @@ jobs:
           - release: oraclelinux-8
             extension: ".rpm"
             OS-name: "el/8"
-          - release: fedora-34
+          - release: fedora-39
             extension: ".rpm"
-            OS-name: "fedora/34"
-          # build issue on fedora 35
-          # - release: fedora-35
-          #   extension: ".rpm"
-          #   OS-name: "fedora/35"
+            OS-name: "fedora/39"
 
     runs-on: ubuntu-latest
     steps:
@@ -130,7 +126,7 @@ jobs:
     needs: CPack-Package-Build
     if: ${{ always() }}
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3