diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index 1651478..e87136f 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -29,6 +29,7 @@ jobs:
           fedora-36,
           fedora-37,
           fedora-38,
+          fedora-39,
           opensuse-15.4,
           ubuntu-18.04,
           ubuntu-20.04,
diff --git a/dockerfiles/fedora/fedora-39/fedora-39-base/Dockerfile b/dockerfiles/fedora/fedora-39/fedora-39-base/Dockerfile
new file mode 100644
index 0000000..efbd6d2
--- /dev/null
+++ b/dockerfiles/fedora/fedora-39/fedora-39-base/Dockerfile
@@ -0,0 +1,80 @@
+# fedora-39-base
+# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2024 Konsulko Group
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+FROM fedora:39
+
+RUN dnf -y update && \
+    dnf -y install \
+	# These packages were copied straight from the Yocto Project reference
+        # manual which is why they are not alphabetized
+        gawk \
+        make \
+        wget \
+        tar \
+        bzip2 \
+        gzip \
+        python3 \
+        unzip \
+        perl \
+        patch \
+        diffutils \
+        diffstat \
+        git \
+        cpp \
+        gcc \
+        gcc-c++ \
+        glibc-devel \
+        texinfo \
+        chrpath \
+        ccache \
+        perl-Data-Dumper \
+        perl-Text-ParseWords \
+        perl-Thread-Queue \
+        perl-bignum \
+        socat \
+        python3-pexpect \
+        findutils \
+        which \
+        file \
+        cpio \
+        python3-pip \
+        xz \
+        python3-GitPython \
+        python3-jinja2 \
+        SDL-devel \
+        xterm \
+        rpcgen \
+	lz4 \
+	zstd \
+        \
+        # These packages were added because of reasons such as fewer packages
+        # being in the container image by default
+        fluxbox \
+        glibc-langpack-en \
+        hostname \
+        procps \
+        python-unversioned-command \
+        subversion \
+        sudo \
+        screen \
+        tigervnc-server \
+        tmux && \
+    cp -af /etc/skel/ /etc/vncskel/ && \
+    echo "export DISPLAY=1" >>/etc/vncskel/.bashrc && \
+    mkdir  /etc/vncskel/.vnc && \
+    echo "" | vncpasswd -f > /etc/vncskel/.vnc/passwd && \
+    chmod 0600 /etc/vncskel/.vnc/passwd && \
+    useradd -U -m yoctouser
+
+COPY build-install-dumb-init.sh /
+RUN  bash /build-install-dumb-init.sh && \
+     rm /build-install-dumb-init.sh && \
+     dnf -y clean all
+
+USER yoctouser
+WORKDIR /home/yoctouser
+CMD /bin/bash