diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml
index 3a23280..f4c6aa1 100644
--- a/ci-scripts/template-vars.yaml
+++ b/ci-scripts/template-vars.yaml
@@ -454,32 +454,6 @@ multiImages:
       - src/ubuntu/install/ansible/**
       - src/ubuntu/install/chrome/**
       - src/ubuntu/install/slack/**
-  - name: fedora-37-desktop
-    singleapp: false
-    base: core-fedora-37
-    dockerfile: dockerfile-kasm-fedora-37-desktop
-    changeFiles:
-      - dockerfile-kasm-fedora-37-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-38-desktop
-    singleapp: false
-    base: core-fedora-38
-    dockerfile: dockerfile-kasm-fedora-38-desktop
-    changeFiles:
-      - dockerfile-kasm-fedora-38-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-39-desktop
     singleapp: false
     base: core-fedora-39
@@ -697,16 +671,6 @@ singleImages:
     changeFiles:
       - dockerfile-kasm-blender
       - src/ubuntu/install/blender/**
-  - name: centos-7-desktop
-    singleapp: false
-    base: core-centos-7
-    dockerfile: dockerfile-kasm-centos-7-desktop
-    changeFiles:
-      - dockerfile-kasm-centos-7-desktop
-      - src/ubuntu/install/thunderbird/**
-      - src/ubuntu/install/firefox/**
-      - src/ubuntu/install/cleanup/**
-      - src/ubuntu/install/chrome/**
   - name: chrome
     singleapp: true
     base: core-ubuntu-focal
@@ -784,18 +748,6 @@ singleImages:
     dockerfile: dockerfile-kasm-only-office
     changeFiles:
       - dockerfile-kasm-only-office
-  - name: oracle-7-desktop
-    singleapp: false
-    base: core-oracle-7
-    dockerfile: dockerfile-kasm-oracle-7-desktop
-    changeFiles:
-      - dockerfile-kasm-oracle-7-desktop
-      - src/oracle/install/**
-      - src/ubuntu/install/thunderbird/**
-      - src/ubuntu/install/remmina/**
-      - src/ubuntu/install/firefox/**
-      - src/ubuntu/install/cleanup/**
-      - src/ubuntu/install/chrome/**
   - name: kasmos-desktop
     singleapp: false
     base: core-kasmos
diff --git a/dockerfile-kasm-centos-7-desktop b/dockerfile-kasm-centos-7-desktop
deleted file mode 100644
index 3265ef5..0000000
--- a/dockerfile-kasm-centos-7-desktop
+++ /dev/null
@@ -1,42 +0,0 @@
-ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-centos-7"
-FROM kasmweb/$BASE_IMAGE:$BASE_TAG
-USER root
-
-ENV DISTRO=centos
-ENV HOME /home/kasm-default-profile
-ENV STARTUPDIR /dockerstartup
-ENV INST_SCRIPTS $STARTUPDIR/install
-WORKDIR $HOME
-
-### Envrionment config
-ENV SKIP_CLEAN=true \
-    KASM_RX_HOME=$STARTUPDIR/kasmrx \
-    INST_DIR=$STARTUPDIR/install \
-    INST_SCRIPTS="/ubuntu/install/misc/install_tools.sh \
-                  /ubuntu/install/chrome/install_chrome.sh \
-                  /ubuntu/install/firefox/install_firefox.sh \
-                  /ubuntu/install/thunderbird/install_thunderbird.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/dockerfile-kasm-fedora-37-desktop b/dockerfile-kasm-fedora-37-desktop
deleted file mode 100644
index 4ea8511..0000000
--- a/dockerfile-kasm-fedora-37-desktop
+++ /dev/null
@@ -1,53 +0,0 @@
-ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-fedora-37"
-FROM kasmweb/$BASE_IMAGE:$BASE_TAG
-
-USER root
-
-ENV DISTRO=fedora37
-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 \
-                  /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/dockerfile-kasm-fedora-38-desktop b/dockerfile-kasm-fedora-38-desktop
deleted file mode 100644
index 577bdde..0000000
--- a/dockerfile-kasm-fedora-38-desktop
+++ /dev/null
@@ -1,54 +0,0 @@
-ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-fedora-38"
-FROM kasmweb/$BASE_IMAGE:$BASE_TAG
-
-USER root
-
-ENV DISTRO=fedora38
-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/terraform/install_terraform.sh \
-                  /oracle/install/telegram/install_telegram.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/dockerfile-kasm-oracle-7-desktop b/dockerfile-kasm-oracle-7-desktop
deleted file mode 100644
index 2e2b513..0000000
--- a/dockerfile-kasm-oracle-7-desktop
+++ /dev/null
@@ -1,52 +0,0 @@
-ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-oracle-7"
-FROM kasmweb/$BASE_IMAGE:$BASE_TAG
-
-USER root
-
-ENV DISTRO=centos
-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/chrome/install_chrome.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 \
-                  /ubuntu/install/thunderbird/install_thunderbird.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/centos-7-desktop/README.md b/docs/centos-7-desktop/README.md
deleted file mode 100644
index 9778b1a..0000000
--- a/docs/centos-7-desktop/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible CentOS 7 XFCE Desktop with Chrome and Firefox installed..
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/image-screenshots/centos-7-desktop.png "Image Screenshot"
\ No newline at end of file
diff --git a/docs/centos-7-desktop/demo.txt b/docs/centos-7-desktop/demo.txt
deleted file mode 100644
index 5f13f4d..0000000
--- a/docs/centos-7-desktop/demo.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Live Demo
-
-<a href="https://app.kasmweb.com/#/cast/1432560159" target="_blank"><img src="https://info.kasmweb.com/hubfs/dockerhub/GIFs/centos-7-desktop.gif" width="640" height="360"></a>
-
-**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/1432560159" target="_blank">Live Demo</a>.
-
-<a href="https://app.kasmweb.com/#/cast/1432560159" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/CENTOS7.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/centos-7-desktop/description.txt b/docs/centos-7-desktop/description.txt
deleted file mode 100644
index 5bf64d8..0000000
--- a/docs/centos-7-desktop/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-CentOS 7 desktop for Kasm Workspaces
\ No newline at end of file
diff --git a/docs/desktop-deluxe/README.md b/docs/desktop-deluxe/README.md
index e152668..5d46f44 100644
--- a/docs/desktop-deluxe/README.md
+++ b/docs/desktop-deluxe/README.md
@@ -1,6 +1,6 @@
 # About This Image
 
-This Image contains a browser-accessible Ubuntu Bionic Desktop with various productivity and development apps installed.
+This Image contains a browser-accessible Ubuntu Focal Desktop with various productivity and development apps installed.
 
 ![Screenshot][Image_Screenshot]
 
diff --git a/docs/desktop/README.md b/docs/desktop/README.md
index 181ca8f..a9a9ff2 100644
--- a/docs/desktop/README.md
+++ b/docs/desktop/README.md
@@ -1,6 +1,6 @@
 # About This Image
 
-This Image contains a browser-accessible Ubuntu Bionic Desktop with Chrome and Firefox installed.
+This Image contains a browser-accessible Ubuntu Focal Desktop with Chrome and Firefox installed.
 
 ![Screenshot][Image_Screenshot]
 
diff --git a/docs/fedora-37-desktop/README.md b/docs/fedora-37-desktop/README.md
deleted file mode 100644
index b71943a..0000000
--- a/docs/fedora-37-desktop/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible Fedora 37 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-37-desktop/demo.txt b/docs/fedora-37-desktop/demo.txt
deleted file mode 100644
index 0b606c7..0000000
--- a/docs/fedora-37-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-37-desktop/description.txt b/docs/fedora-37-desktop/description.txt
deleted file mode 100644
index 1b29538..0000000
--- a/docs/fedora-37-desktop/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fedora 37 desktop for Kasm Workspaces
diff --git a/docs/fedora-38-desktop/README.md b/docs/fedora-38-desktop/README.md
deleted file mode 100644
index 927ef38..0000000
--- a/docs/fedora-38-desktop/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible Fedora 38 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-38-desktop/demo.txt b/docs/fedora-38-desktop/demo.txt
deleted file mode 100644
index 0b606c7..0000000
--- a/docs/fedora-38-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-38-desktop/description.txt b/docs/fedora-38-desktop/description.txt
deleted file mode 100644
index e73fd2d..0000000
--- a/docs/fedora-38-desktop/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fedora 38 desktop for Kasm Workspaces
diff --git a/docs/java-dev/README.md b/docs/java-dev/README.md
index be61ba0..e281aaf 100644
--- a/docs/java-dev/README.md
+++ b/docs/java-dev/README.md
@@ -1,6 +1,6 @@
 # About This Image
 
-This Image contains a browser-accessible Ubuntu Bionic Desktop with a Java development environment.
+This Image contains a browser-accessible Ubuntu Focal Desktop with a Java development environment.
 
 ![Screenshot][Image_Screenshot]
 
diff --git a/docs/oracle-7-desktop/README.md b/docs/oracle-7-desktop/README.md
deleted file mode 100644
index a5c2684..0000000
--- a/docs/oracle-7-desktop/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible Oracle Linux 7 Desktop with various productivity and development apps installed.
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/oracle-7-desktop.png "Image Screenshot"
diff --git a/docs/oracle-7-desktop/demo.txt b/docs/oracle-7-desktop/demo.txt
deleted file mode 100644
index 4320df5..0000000
--- a/docs/oracle-7-desktop/demo.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# Live Demo
-
-<a href="https://app.kasmweb.com/#/cast/8652257120" target="_blank"><img src="https://info.kasmweb.com/hubfs/dockerhub/GIFs/oracle-7-desktop.gif" width="640" height="360"></a>
-
-**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/8652257120" target="_blank">Live Demo</a>.
-
-<a href="https://app.kasmweb.com/#/cast/8652257120" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/OracleLinux7.png" width="300" height="104"></a>
-
-&lowast;*This demo is linked to Oracle Linux 8*
-
-&lowast;*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.*
diff --git a/docs/oracle-7-desktop/description.txt b/docs/oracle-7-desktop/description.txt
deleted file mode 100644
index 11d4ea6..0000000
--- a/docs/oracle-7-desktop/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Oracle Linux 7 desktop for Kasm Workspaces
diff --git a/src/oracle/install/ansible/install_ansible.sh b/src/oracle/install/ansible/install_ansible.sh
index e76efcf..fee18d1 100644
--- a/src/oracle/install/ansible/install_ansible.sh
+++ b/src/oracle/install/ansible/install_ansible.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex
 
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   dnf install -y ansible
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
diff --git a/src/oracle/install/gimp/install_gimp.sh b/src/oracle/install/gimp/install_gimp.sh
index c72b185..d638116 100644
--- a/src/oracle/install/gimp/install_gimp.sh
+++ b/src/oracle/install/gimp/install_gimp.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -ex
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   dnf install -y gimp
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
diff --git a/src/oracle/install/libre_office/install_libre_office.sh b/src/oracle/install/libre_office/install_libre_office.sh
index 5f9ce68..437b401 100644
--- a/src/oracle/install/libre_office/install_libre_office.sh
+++ b/src/oracle/install/libre_office/install_libre_office.sh
@@ -7,7 +7,7 @@ if [ "$ARCH" == "amd64" ] ; then
   exit 0
 fi
 
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   dnf install -y \
     libreoffice-core \
     libreoffice-writer \
diff --git a/src/oracle/install/only_office/install_only_office.sh b/src/oracle/install/only_office/install_only_office.sh
index 26cac31..030e9e9 100644
--- a/src/oracle/install/only_office/install_only_office.sh
+++ b/src/oracle/install/only_office/install_only_office.sh
@@ -8,7 +8,7 @@ if [ "$ARCH" == "arm64" ] ; then
 fi
 
 curl -L -o only_office.rpm "https://download.onlyoffice.com/install/desktop/editors/linux/onlyoffice-desktopeditors.$(arch).rpm"
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   dnf localinstall -y only_office.rpm
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
diff --git a/src/oracle/install/slack/install_slack.sh b/src/oracle/install/slack/install_slack.sh
index 28e9b7c..88a2a7a 100644
--- a/src/oracle/install/slack/install_slack.sh
+++ b/src/oracle/install/slack/install_slack.sh
@@ -21,7 +21,7 @@ version=4.12.2
 
 # This path may not be accurate once arm64 support arrives. Specifically I don't know if it will still be under x64
 wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-${version}-0.1.fc21.x86_64.rpm -O slack.rpm
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   dnf localinstall -y slack.rpm
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
diff --git a/src/oracle/install/sublime_text/install_sublime_text.sh b/src/oracle/install/sublime_text/install_sublime_text.sh
index f09887b..e3c7a1a 100644
--- a/src/oracle/install/sublime_text/install_sublime_text.sh
+++ b/src/oracle/install/sublime_text/install_sublime_text.sh
@@ -8,7 +8,7 @@ fi
 
 rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
 
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo
   dnf install -y sublime-text
   if [ -z ${SKIP_CLEAN+x} ]; then
diff --git a/src/oracle/install/terraform/install_terraform.sh b/src/oracle/install/terraform/install_terraform.sh
index aecc842..ef06bdc 100644
--- a/src/oracle/install/terraform/install_terraform.sh
+++ b/src/oracle/install/terraform/install_terraform.sh
@@ -14,7 +14,7 @@ if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almali
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
   fi
-elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]]; then
+elif [[ "${DISTRO}" == @(fedora39|fedora40) ]]; then
   dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
   dnf install -y terraform
   if [ -z ${SKIP_CLEAN+x} ]; then
diff --git a/src/oracle/install/vs_code/install_vs_code.sh b/src/oracle/install/vs_code/install_vs_code.sh
index def2b44..05c8858 100644
--- a/src/oracle/install/vs_code/install_vs_code.sh
+++ b/src/oracle/install/vs_code/install_vs_code.sh
@@ -3,7 +3,7 @@ set -ex
 ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/x64/g')
 
 wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   wget -q https://update.code.visualstudio.com/latest/linux-rpm-${ARCH}/stable -O vs_code.rpm
   dnf localinstall -y vs_code.rpm
 else
@@ -20,7 +20,7 @@ chown 1000:1000 $HOME/Desktop/code.desktop
 rm vs_code.rpm
 
 # Conveniences for python development
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   dnf install -y python3-setuptools python3-virtualenv
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
diff --git a/src/oracle/install/zoom/install_zoom.sh b/src/oracle/install/zoom/install_zoom.sh
index 4bcc98b..15642db 100644
--- a/src/oracle/install/zoom/install_zoom.sh
+++ b/src/oracle/install/zoom/install_zoom.sh
@@ -8,7 +8,7 @@ fi
 
 
 wget -q https://zoom.us/client/latest/zoom_$(arch).rpm
-if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   dnf localinstall -y zoom_$(arch).rpm
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
diff --git a/src/ubuntu/install/chromium/install_chromium.sh b/src/ubuntu/install/chromium/install_chromium.sh
index 30b786d..b9c9a87 100644
--- a/src/ubuntu/install/chromium/install_chromium.sh
+++ b/src/ubuntu/install/chromium/install_chromium.sh
@@ -9,17 +9,10 @@ if [[ "${DISTRO}" == @(debian|opensuse|ubuntu) ]] && [ ${ARCH} = 'amd64' ] && [
   exit 0
 fi
 
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-    dnf install -y chromium
-    if [ -z ${SKIP_CLEAN+x} ]; then
-      dnf clean all
-    fi
-  else
-    yum install -y chromium
-    if [ -z ${SKIP_CLEAN+x} ]; then
-      yum clean all
-    fi
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+  dnf install -y chromium
+  if [ -z ${SKIP_CLEAN+x} ]; then
+    dnf clean all
   fi
 elif [ "${DISTRO}" == "opensuse" ]; then
   zypper install -yn chromium
@@ -124,7 +117,7 @@ if [ "${DISTRO}" != "opensuse" ] && ! grep -q "ID=debian" /etc/os-release && ! g
   cp /usr/bin/chromium-browser /usr/bin/chromium
 fi
 
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
   cat >> $HOME/.config/mimeapps.list <<EOF
     [Default Applications]
     x-scheme-handler/http=${REAL_BIN}.desktop
diff --git a/src/ubuntu/install/cleanup/cleanup.sh b/src/ubuntu/install/cleanup/cleanup.sh
index bf32f51..ab7441e 100644
--- a/src/ubuntu/install/cleanup/cleanup.sh
+++ b/src/ubuntu/install/cleanup/cleanup.sh
@@ -2,9 +2,7 @@
 set -ex
 
 # Distro package cleanup
-if [[ "${DISTRO}" == @(centos|oracle7) ]] ; then
-  yum clean all
-elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|fedora40|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then
+if [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora39|fedora40|oracle8|oracle9|rockylinux8|rockylinux9) ]]; then
   dnf clean all
 elif [ "${DISTRO}" == "opensuse" ]; then
   zypper clean --all
diff --git a/src/ubuntu/install/firefox/install_firefox.sh b/src/ubuntu/install/firefox/install_firefox.sh
index 782b016..cb37fe2 100644
--- a/src/ubuntu/install/firefox/install_firefox.sh
+++ b/src/ubuntu/install/firefox/install_firefox.sh
@@ -13,12 +13,8 @@ set_desktop_icon() {
 }
 
 echo "Install Firefox"
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-    dnf install -y firefox p11-kit
-  else
-    yum install -y firefox p11-kit
-  fi
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+  dnf install -y firefox p11-kit
 elif [ "${DISTRO}" == "opensuse" ]; then
   zypper install -yn p11-kit-tools MozillaFirefox
 elif grep -q Jammy /etc/os-release || grep -q Noble /etc/os-release; then
@@ -32,7 +28,18 @@ Pin-Priority: 1001
   fi
   apt-get install -y firefox p11-kit-modules
 elif grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release; then
-  if grep -q "bullseye" /etc/os-release; then
+  if [ "${ARCH}" == "amd64" ]; then
+    install -d -m 0755 /etc/apt/keyrings
+    wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- > /etc/apt/keyrings/packages.mozilla.org.asc
+    echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" > /etc/apt/sources.list.d/mozilla.list
+echo '
+Package: *
+Pin: origin packages.mozilla.org
+Pin-Priority: 1000
+' > /etc/apt/preferences.d/mozilla
+    apt-get update
+    apt-get install -y firefox p11-kit-modules
+  else
     apt-get update
     apt-get install -y firefox-esr p11-kit-modules
     rm -f $HOME/Desktop/firefox.desktop
@@ -40,21 +47,6 @@ elif grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release ||
       /usr/share/applications/firefox-esr.desktop \
       $HOME/Desktop/
     chmod +x $HOME/Desktop/firefox-esr.desktop
-  else
-    echo \
-      "deb http://deb.debian.org/debian/ unstable main contrib non-free" >> \
-      /etc/apt/sources.list
-cat > /etc/apt/preferences.d/99pin-unstable <<EOF
-Package: *
-Pin: release a=stable
-Pin-Priority: 900
-
-Package: *
-Pin: release a=unstable
-Pin-Priority: 10
-EOF
-    apt-get update
-    apt-get install -o Dpkg::Options::="--force-confnew" -y -t unstable firefox p11-kit-modules
   fi
 else
   apt-mark unhold firefox || :
@@ -78,15 +70,9 @@ for LANG in ${LANGS}; do
 done
 
 # Cleanup and install flash if supported
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-    if [ -z ${SKIP_CLEAN+x} ]; then
-      dnf clean all
-    fi
-  else
-    if [ -z ${SKIP_CLEAN+x} ]; then
-      yum clean all
-    fi
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+  if [ -z ${SKIP_CLEAN+x} ]; then
+    dnf clean all
   fi
 elif [ "${DISTRO}" == "opensuse" ]; then
   if [ -z ${SKIP_CLEAN+x} ]; then
@@ -111,9 +97,9 @@ else
   fi
 fi
 
-if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
   # Update firefox to utilize the system certificate store instead of the one that ships with firefox
-  if grep -q "bullseye" /etc/os-release; then
+  if grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release && [ "${ARCH}" == "arm64" ]; then
     rm -f /usr/lib/firefox-esr/libnssckbi.so
     ln /usr/lib/$(arch)-linux-gnu/pkcs11/p11-kit-trust.so /usr/lib/firefox-esr/libnssckbi.so
   else
@@ -122,8 +108,8 @@ if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9
   fi
 fi
 
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-  if [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+  if [[ "${DISTRO}" == @(fedora39|fedora40) ]]; then
     preferences_file=/usr/lib64/firefox/browser/defaults/preferences/firefox-redhat-default-prefs.js
   else
     preferences_file=/usr/lib64/firefox/browser/defaults/preferences/all-redhat.js
@@ -131,14 +117,18 @@ if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9
   sed -i -e '/homepage/d' "$preferences_file"
 elif [ "${DISTRO}" == "opensuse" ]; then
   preferences_file=/usr/lib64/firefox/browser/defaults/preferences/firefox.js
-elif grep -q "bullseye" /etc/os-release; then
-  preferences_file=/usr/lib/firefox-esr/browser/defaults/preferences/firefox.js
+elif grep -q "ID=debian" /etc/os-release || grep -q "ID=kali" /etc/os-release || grep -q "ID=parrot" /etc/os-release; then
+  if [ "${ARCH}" == "amd64" ]; then
+    preferences_file=/usr/lib/firefox/defaults/pref/firefox.js
+  else
+    preferences_file=/usr/lib/firefox-esr/browser/defaults/preferences/firefox.js
+  fi
 else
   preferences_file=/usr/lib/firefox/browser/defaults/preferences/firefox.js
 fi
 
 # Disabling default first run URL for Debian based images
-if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
 cat >"$preferences_file" <<EOF
 pref("datareporting.policy.firstRunURL", "");
 pref("datareporting.policy.dataSubmissionEnabled", false);
@@ -149,7 +139,7 @@ pref("browser.aboutwelcome.enabled", false);
 EOF
 fi
 
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
   # Creating a default profile
   chown -R root:root $HOME
   firefox -headless -CreateProfile "kasm $HOME/.mozilla/firefox/kasm"
@@ -173,7 +163,7 @@ else
   firefox -headless -CreateProfile "kasm $HOME/.mozilla/firefox/kasm"
 fi
 
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
   set_desktop_icon
 fi
 
@@ -181,13 +171,13 @@ fi
 #   based off the installation path. Because that path will be static for our deployments we can assume the hash
 #   and thus assign our profile to the default for the installation
 
-if [[ "${DISTRO}" != @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" != @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
 cat >>$HOME/.mozilla/firefox/profiles.ini <<EOL
 [Install4F96D1932A9F858E]
 Default=kasm
 Locked=1
 EOL
-elif [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora37|fedora38|fedora39|fedora40) ]]; then
+elif [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|opensuse|fedora39|fedora40) ]]; then
 cat >>$HOME/.mozilla/firefox/profiles.ini <<EOL
 [Install11457493C5A56847]
 Default=kasm
diff --git a/src/ubuntu/install/remmina/install_remmina.sh b/src/ubuntu/install/remmina/install_remmina.sh
index ad40fc8..c2b205b 100644
--- a/src/ubuntu/install/remmina/install_remmina.sh
+++ b/src/ubuntu/install/remmina/install_remmina.sh
@@ -1,22 +1,17 @@
 #!/usr/bin/env bash
 set -ex
 
-if [[ "${DISTRO}" == @(centos|oracle7|oracle8|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+if [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux9|rockylinux8|almalinux9|almalinux8|fedora39|fedora40) ]]; then
   if [[ "${DISTRO}" == @(oracle8|rockylinux8|almalinux8) ]]; then
     dnf install -y remmina remmina-plugins-rdp remmina-plugins-secret remmina-plugins-spice xdotool
     if [ -z ${SKIP_CLEAN+x} ]; then
       dnf clean all
     fi
-  elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9|fedora37|fedora38|fedora39|fedora40) ]]; then
+  elif [[ "${DISTRO}" == @(rockylinux9|oracle9|almalinux9|fedora39|fedora40) ]]; then
     dnf install -y remmina remmina-plugins-rdp remmina-plugins-secret xdotool
     if [ -z ${SKIP_CLEAN+x} ]; then
       dnf clean all
     fi
-  else
-    yum install -y remmina remmina-plugins-rdp remmina-plugins-secret remmina-plugins-spice xdotool
-    if [ -z ${SKIP_CLEAN+x} ]; then
-      yum clean all
-    fi
   fi
 elif [ "${DISTRO}" == "opensuse" ]; then
   zypper install -yn remmina remmina-plugin-rdp remmina-plugin-secret remmina-plugin-spice xdotool
diff --git a/src/ubuntu/install/slack/install_slack.sh b/src/ubuntu/install/slack/install_slack.sh
index 4cc14c7..1c0678c 100644
--- a/src/ubuntu/install/slack/install_slack.sh
+++ b/src/ubuntu/install/slack/install_slack.sh
@@ -12,11 +12,11 @@ version=$(curl -q https://slack.com/downloads/linux | grep page-downloads__hero_
 echo Detected slack version $version
 
 
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40|opensuse) ]]; then
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40|opensuse) ]]; then
 
   wget -q https://downloads.slack-edge.com/desktop-releases/linux/x64/${version}/slack-${version}-0.1.el8.x86_64.rpm
 
-  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
+  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
     dnf localinstall -y slack-${version}-0.1.el8.x86_64.rpm
     if [ -z ${SKIP_CLEAN+x} ]; then
       dnf clean all
@@ -28,11 +28,6 @@ if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9
     if [ -z ${SKIP_CLEAN+x} ]; then
       zypper clean --all
     fi
-  else
-    yum localinstall -y slack-${version}-0.1.el8.x86_64.rpm
-    if [ -z ${SKIP_CLEAN+x} ]; then
-      yum clean all
-    fi
   fi
 
   rm slack-${version}-0.1.el8.x86_64.rpm
diff --git a/src/ubuntu/install/thunderbird/install_thunderbird.sh b/src/ubuntu/install/thunderbird/install_thunderbird.sh
index 9412070..6c10fc6 100644
--- a/src/ubuntu/install/thunderbird/install_thunderbird.sh
+++ b/src/ubuntu/install/thunderbird/install_thunderbird.sh
@@ -2,17 +2,10 @@
 set -ex
 
 # Install
-if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-  if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37|fedora38|fedora39|fedora40) ]]; then
-    dnf install -y thunderbird
-    if [ -z ${SKIP_CLEAN+x} ]; then
-      dnf clean all
-    fi
-  else
-    yum install -y thunderbird
-    if [ -z ${SKIP_CLEAN+x} ]; then
-      yum clean all
-    fi
+if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora39|fedora40) ]]; then
+  dnf install -y thunderbird
+  if [ -z ${SKIP_CLEAN+x} ]; then
+    dnf clean all
   fi
 elif [ "${DISTRO}" == "opensuse" ]; then
   zypper install -yn MozillaThunderbird
@@ -48,7 +41,7 @@ Pin-Priority: 1001
 fi
 
 # Desktop icon
-if [[ "${DISTRO}" == @(fedora37|fedora38|fedora39) ]]; then
+if [[ "${DISTRO}" == "fedora39" ]]; then
   cp /usr/share/applications/mozilla-thunderbird.desktop $HOME/Desktop/
   chmod +x $HOME/Desktop/mozilla-thunderbird.desktop
 elif [[ "${DISTRO}" == "fedora40" ]]; then
diff --git a/src/ubuntu/install/vpn/install_vpn.sh b/src/ubuntu/install/vpn/install_vpn.sh
index 607d26b..7ba0677 100644
--- a/src/ubuntu/install/vpn/install_vpn.sh
+++ b/src/ubuntu/install/vpn/install_vpn.sh
@@ -25,14 +25,7 @@ elif [[ "${DISTRO}" == @(oracle8|oracle9|rockylinux8|rockylinux9|almalinux8|alma
     openvpn \
     wireguard-tools \
     jq
-elif [[ "${DISTRO}" == @(centos|oracle7) ]]; then
-  yum install -y epel-release
-  yum install -y \
-    openvpn \
-    wireguard-tools \
-    zenity \
-    jq
-elif [[ "${DISTRO}" == @(fedora37|fedora38|fedora39|fedora40) ]] ; then
+elif [[ "${DISTRO}" == @(fedora39|fedora40) ]] ; then
   dnf install -y \
     openresolv \
     openvpn \
@@ -54,26 +47,15 @@ ID=$(cat /etc/os-release | awk -F'=' '/^ID=/ {print $2}')
 VERSION=$(cat /etc/os-release | awk -F'"' '/^VERSION_ID=/ {print $2}')
 VERSION2=$(cat /etc/os-release | awk -F'=' '/^VERSION_ID=/ {print $2}')
 if [[ "${FLAVOR}" ]]; then
-  if [[ "${FLAVOR}" == "bionic" ]]; then
-    curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.asc | apt-key add -
-    curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.list | tee /etc/apt/sources.list.d/tailscale.list
-    apt-get update 
-    apt-get install -y --no-install-recommends tailscale
-  else
-    FLAVOR=$(echo ${FLAVOR} | sed -e 's/ara/sid/g' -e 's/kali-rolling/sid/g')
-    ID=$(echo ${ID} | sed -e 's/kali/debian/g' -e 's/parrot/debian/g')
-    mkdir -p --mode=0755 /usr/share/keyrings
-    curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.noarmor.gpg | tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null
-    curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.tailscale-keyring.list | tee /etc/apt/sources.list.d/tailscale.list
-    apt-get update
-    apt-get install -y --no-install-recommends tailscale
-  fi
+  FLAVOR=$(echo ${FLAVOR} | sed -e 's/ara/sid/g' -e 's/kali-rolling/sid/g')
+  ID=$(echo ${ID} | sed -e 's/kali/debian/g' -e 's/parrot/debian/g')
+  mkdir -p --mode=0755 /usr/share/keyrings
+  curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.noarmor.gpg | tee /usr/share/keyrings/tailscale-archive-keyring.gpg >/dev/null
+  curl -fsSL https://pkgs.tailscale.com/stable/${ID}/${FLAVOR}.tailscale-keyring.list | tee /etc/apt/sources.list.d/tailscale.list
+  apt-get update
+  apt-get install -y --no-install-recommends tailscale
 else
-  if [[ "${VERSION}" == "7" ]] || [[ "${VERSION}" = "7*" ]]; then
-    yum install -y yum-utils
-    yum-config-manager --add-repo https://pkgs.tailscale.com/stable/centos/7/tailscale.repo
-    yum install -y tailscale
-  elif [[ "${VERSION}" == "8" ]] || [[ "${VERSION}" = "8*" ]]; then
+  if [[ "${VERSION}" == "8" ]] || [[ "${VERSION}" = "8*" ]]; then
     dnf install -y 'dnf-command(config-manager)'
     dnf config-manager --add-repo https://pkgs.tailscale.com/stable/centos/8/tailscale.repo
     dnf install -y tailscale