diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b753abb..90b08af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
   - template
   - run
 variables:
-  BASE_TAG: "develop"
+  BASE_TAG: "1.18.0-rolling-weekly"
   USE_PRIVATE_IMAGES: 0
   KASM_RELEASE: "1.18.0"
   TEST_INSTALLER: "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.18.0.09f70a.tar.gz"
diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml
index f840c6b..b493c78 100644
--- a/ci-scripts/template-vars.yaml
+++ b/ci-scripts/template-vars.yaml
@@ -519,20 +519,6 @@ multiImages:
       - src/ubuntu/install/ansible/**
       - src/ubuntu/install/chrome/**
       - src/ubuntu/install/slack/**
-  - name: fedora-39-desktop
-    runset: set-b
-    singleapp: false
-    base: core-fedora-39
-    dockerfile: dockerfile-kasm-fedora-39-desktop
-    changeFiles:
-      - dockerfile-kasm-fedora-39-desktop
-      - src/oracle/install/**
-      - src/ubuntu/install/thunderbird/**
-      - src/ubuntu/install/remmina/**
-      - src/ubuntu/install/firefox/**
-      - src/ubuntu/install/cleanup/**
-      - src/ubuntu/install/chromium/**
-      - src/ubuntu/install/slack/**
   - name: fedora-40-desktop
     runset: set-a
     singleapp: false
diff --git a/dockerfile-kasm-fedora-39-desktop b/dockerfile-kasm-fedora-39-desktop
deleted file mode 100644
index c0c0efa..0000000
--- a/dockerfile-kasm-fedora-39-desktop
+++ /dev/null
@@ -1,54 +0,0 @@
-ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-fedora-39"
-FROM kasmweb/$BASE_IMAGE:$BASE_TAG
-
-USER root
-
-ENV DISTRO=fedora39
-ENV HOME /home/kasm-default-profile
-ENV STARTUPDIR /dockerstartup
-WORKDIR $HOME
-
-### Envrionment config
-ENV SKIP_CLEAN=true \
-    KASM_RX_HOME=$STARTUPDIR/kasmrx \
-    DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \
-    INST_DIR=$STARTUPDIR/install \
-    INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \
-                  /oracle/install/misc/install_tools.sh \
-                  /ubuntu/install/chromium/install_chromium.sh \
-                  /ubuntu/install/firefox/install_firefox.sh \
-                  /oracle/install/sublime_text/install_sublime_text.sh \
-                  /oracle/install/vs_code/install_vs_code.sh \
-                  /ubuntu/install/remmina/install_remmina.sh \
-                  /oracle/install/only_office/install_only_office.sh \
-                  /oracle/install/gimp/install_gimp.sh \
-                  /oracle/install/zoom/install_zoom.sh \
-                  /oracle/install/ansible/install_ansible.sh \
-                  /oracle/install/telegram/install_telegram.sh \
-                  /oracle/install/terraform/install_terraform.sh \
-                  /ubuntu/install/thunderbird/install_thunderbird.sh \
-                  /ubuntu/install/slack/install_slack.sh \
-                  /ubuntu/install/cleanup/cleanup.sh"
-
-# Copy install scripts
-COPY ./src/ $INST_DIR
-
-# Run installations
-RUN \
-  for SCRIPT in $INST_SCRIPTS; do \
-    bash ${INST_DIR}${SCRIPT} || exit 1; \
-  done && \
-  $STARTUPDIR/set_user_permission.sh $HOME && \
-  rm -f /etc/X11/xinit/Xclients && \
-  chown 1000:0 $HOME && \
-  mkdir -p /home/kasm-user && \
-  chown -R 1000:0 /home/kasm-user && \
-  rm -Rf ${INST_DIR}
-
-# Userspace Runtime
-ENV HOME /home/kasm-user
-WORKDIR $HOME
-USER 1000
-
-CMD ["--tail-log"]
diff --git a/docs/fedora-39-desktop/README.md b/docs/fedora-39-desktop/README.md
deleted file mode 100644
index 5f371a0..0000000
--- a/docs/fedora-39-desktop/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible Fedora 39 Desktop with various productivity and development apps installed.
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/image-screenshots/fedora-37-desktop.png "Image Screenshot"
diff --git a/docs/fedora-39-desktop/demo.txt b/docs/fedora-39-desktop/demo.txt
deleted file mode 100644
index 0b606c7..0000000
--- a/docs/fedora-39-desktop/demo.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Live Demo
-
-<a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank"><img src="https://info.kasmweb.com/hubfs/dockerhub/GIFs/ubuntu-jammy-desktop.gif" width="640" height="360"></a>
-
-**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank">Live Demo</a>.
-
-<a href="https://app.kasmweb.com/#/cast/6708319219" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/UbuntuJammyDesktop.png" width="300" height="104"></a>
-
-&lowast;*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.*
diff --git a/docs/fedora-39-desktop/description.txt b/docs/fedora-39-desktop/description.txt
deleted file mode 100644
index a649ce6..0000000
--- a/docs/fedora-39-desktop/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fedora 39 desktop for Kasm Workspaces