diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml
index a560766..d4568eb 100644
--- a/ci-scripts/template-vars.yaml
+++ b/ci-scripts/template-vars.yaml
@@ -162,7 +162,7 @@ multiImages:
       - src/ubuntu/install/remmina/**
   - name: spiderfoot
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-spiderfoot
     changeFiles:
       - dockerfile-kasm-spiderfoot
@@ -172,14 +172,14 @@ multiImages:
       - src/ubuntu/install/cleanup/**
   - name: sublime-text
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-sublime-text
     changeFiles:
       - dockerfile-kasm-sublime-text
       - src/ubuntu/install/sublime_text/**
   - name: telegram
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-telegram
     changeFiles:
       - dockerfile-kasm-telegram
@@ -187,7 +187,7 @@ multiImages:
       - src/ubuntu/install/chrome/**
   - name: terminal
     singleapp: false
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-terminal
     changeFiles:
       - dockerfile-kasm-terminal
@@ -196,74 +196,19 @@ multiImages:
       - src/ubuntu/install/terminal/**
   - name: thunderbird
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-thunderbird
     changeFiles:
       - dockerfile-kasm-thunderbird
       - src/ubuntu/install/thunderbird/**
   - name: tor-browser
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-tor-browser
     changeFiles:
       - dockerfile-kasm-tor-browser
       - src/ubuntu/install/gtk/**
       - src/ubuntu/install/torbrowser/**
-  - name: ubuntu-focal-desktop
-    singleapp: false
-    base: core-ubuntu-focal
-    dockerfile: dockerfile-kasm-ubuntu-focal-desktop
-    changeFiles:
-      - dockerfile-kasm-ubuntu-focal-desktop
-      - src/ubuntu/install/zoom/**
-      - src/ubuntu/install/vs_code/**
-      - src/ubuntu/install/tools/**
-      - src/ubuntu/install/thunderbird/**
-      - src/ubuntu/install/terraform/**
-      - src/ubuntu/install/telegram/**
-      - src/ubuntu/install/sublime_text/**
-      - src/ubuntu/install/signal/**
-      - src/ubuntu/install/remmina/**
-      - src/ubuntu/install/only_office/**
-      - src/ubuntu/install/obs/**
-      - src/ubuntu/install/nextcloud/**
-      - src/ubuntu/install/misc/**
-      - src/ubuntu/install/gimp/**
-      - src/ubuntu/install/gamepad_utils/**
-      - src/ubuntu/install/firefox/**
-      - src/ubuntu/install/cleanup/**
-      - src/ubuntu/install/chromium/**
-      - src/ubuntu/install/ansible/**
-      - src/ubuntu/install/chrome/**
-      - src/ubuntu/install/slack/**
-  - name: ubuntu-focal-desktop-vpn
-    singleapp: false
-    base: core-ubuntu-focal
-    dockerfile: dockerfile-kasm-ubuntu-focal-desktop-vpn
-    changeFiles:
-      - dockerfile-kasm-ubuntu-focal-desktop
-      - src/ubuntu/install/zoom/**
-      - src/ubuntu/install/vs_code/**
-      - src/ubuntu/install/tools/**
-      - src/ubuntu/install/thunderbird/**
-      - src/ubuntu/install/terraform/**
-      - src/ubuntu/install/telegram/**
-      - src/ubuntu/install/sublime_text/**
-      - src/ubuntu/install/signal/**
-      - src/ubuntu/install/remmina/**
-      - src/ubuntu/install/only_office/**
-      - src/ubuntu/install/obs/**
-      - src/ubuntu/install/nextcloud/**
-      - src/ubuntu/install/misc/**
-      - src/ubuntu/install/gimp/**
-      - src/ubuntu/install/gamepad_utils/**
-      - src/ubuntu/install/firefox/**
-      - src/ubuntu/install/cleanup/**
-      - src/ubuntu/install/chromium/**
-      - src/ubuntu/install/ansible/**
-      - src/ubuntu/install/chrome/**
-      - src/ubuntu/install/slack/**
-      - src/ubuntu/install/vpn/**
   - name: ubuntu-jammy-desktop
     singleapp: false
     base: core-ubuntu-jammy
@@ -291,6 +236,34 @@ multiImages:
       - src/ubuntu/install/ansible/**
       - src/ubuntu/install/chrome/**
       - src/ubuntu/install/slack/**
+  - name: ubuntu-jammy-desktop-vpn
+    singleapp: false
+    base: core-ubuntu-jammy
+    dockerfile: dockerfile-kasm-ubuntu-jammy-desktop-vpn
+    changeFiles:
+      - dockerfile-kasm-ubuntu-jammy-desktop-vpn
+      - src/ubuntu/install/zoom/**
+      - src/ubuntu/install/vs_code/**
+      - src/ubuntu/install/tools/**
+      - src/ubuntu/install/thunderbird/**
+      - src/ubuntu/install/terraform/**
+      - src/ubuntu/install/telegram/**
+      - src/ubuntu/install/sublime_text/**
+      - src/ubuntu/install/signal/**
+      - src/ubuntu/install/remmina/**
+      - src/ubuntu/install/only_office/**
+      - src/ubuntu/install/obs/**
+      - src/ubuntu/install/nextcloud/**
+      - src/ubuntu/install/misc/**
+      - src/ubuntu/install/gimp/**
+      - src/ubuntu/install/gamepad_utils/**
+      - src/ubuntu/install/firefox/**
+      - src/ubuntu/install/cleanup/**
+      - src/ubuntu/install/chromium/**
+      - src/ubuntu/install/ansible/**
+      - src/ubuntu/install/chrome/**
+      - src/ubuntu/install/slack/**
+      - src/ubuntu/install/vpn/**
   - name: ubuntu-noble-desktop
     singleapp: false
     base: core-ubuntu-noble
@@ -320,14 +293,14 @@ multiImages:
       - src/ubuntu/install/slack/**
   - name: vlc
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-vlc
     changeFiles:
       - dockerfile-kasm-vlc
       - src/ubuntu/install/vlc/**
   - name: vs-code
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-vs-code
     changeFiles:
       - dockerfile-kasm-vs-code
@@ -585,39 +558,11 @@ multiImages:
       - src/ubuntu/install/slack/**
   - name: super-tux-kart
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-super-tux-kart
     changeFiles:
       - dockerfile-kasm-super-tux-kart
       - src/ubuntu/install/super_tux_kart/**
-  - name: ubuntu-focal-dind
-    singleapp: false
-    base: core-ubuntu-focal
-    dockerfile: dockerfile-kasm-ubuntu-focal-dind
-    changeFiles:
-      - dockerfile-kasm-ubuntu-focal-dind
-      - src/ubuntu/install/vs_code/**
-      - src/ubuntu/install/tools/**
-      - src/ubuntu/install/sublime_text/**
-      - src/ubuntu/install/misc/**
-      - src/ubuntu/install/dind/**
-      - src/ubuntu/install/cleanup/**
-      - src/ubuntu/install/chromium/**
-      - src/ubuntu/install/chrome/**
-  - name: ubuntu-focal-dind-rootless
-    singleapp: false
-    base: core-ubuntu-focal
-    dockerfile: dockerfile-kasm-ubuntu-focal-dind-rootless
-    changeFiles:
-      - dockerfile-kasm-ubuntu-focal-dind-rootless
-      - src/ubuntu/install/vs_code/**
-      - src/ubuntu/install/tools/**
-      - src/ubuntu/install/sublime_text/**
-      - src/ubuntu/install/misc/**
-      - src/ubuntu/install/dind_rootless/**
-      - src/ubuntu/install/cleanup/**
-      - src/ubuntu/install/chromium/**
-      - src/ubuntu/install/chrome/**
   - name: ubuntu-jammy-dind
     singleapp: false
     base: core-ubuntu-jammy
@@ -678,7 +623,7 @@ multiImages:
       - src/ubuntu/install/chrome/**
   - name: vivaldi
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-vivaldi
     changeFiles:
       - dockerfile-kasm-vivaldi
@@ -808,14 +753,14 @@ singleImages:
       - src/ubuntu/install/remnux/**
   - name: signal
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-signal
     changeFiles:
       - dockerfile-kasm-signal
       - src/ubuntu/install/signal/**
   - name: slack
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-slack
     changeFiles:
       - dockerfile-kasm-slack
@@ -825,7 +770,7 @@ singleImages:
       - src/ubuntu/install/cleanup/**
   - name: steam
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-steam
     changeFiles:
       - dockerfile-kasm-steam
@@ -841,7 +786,7 @@ singleImages:
       - src/ubuntu/install/tracelabs/**
   - name: unityhub
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-unityhub
     changeFiles:
       - dockerfile-kasm-unityhub
@@ -850,7 +795,7 @@ singleImages:
       - src/ubuntu/install/unityhub/**
   - name: zoom
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-zoom
     changeFiles:
       - dockerfile-kasm-zoom
@@ -858,7 +803,7 @@ singleImages:
       - src/ubuntu/install/chrome/**
   - name: zsnes
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-zsnes
     changeFiles:
       - dockerfile-kasm-zsnes
diff --git a/dockerfile-kasm-signal b/dockerfile-kasm-signal
index 2468b12..9cc434e 100644
--- a/dockerfile-kasm-signal
+++ b/dockerfile-kasm-signal
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-slack b/dockerfile-kasm-slack
index 785f5c3..fe5707f 100644
--- a/dockerfile-kasm-slack
+++ b/dockerfile-kasm-slack
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-spiderfoot b/dockerfile-kasm-spiderfoot
index 6c453f4..d6e360c 100644
--- a/dockerfile-kasm-spiderfoot
+++ b/dockerfile-kasm-spiderfoot
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 
 USER root
diff --git a/dockerfile-kasm-steam b/dockerfile-kasm-steam
index 54c7dda..982dd19 100644
--- a/dockerfile-kasm-steam
+++ b/dockerfile-kasm-steam
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-sublime-text b/dockerfile-kasm-sublime-text
index d833711..64535f6 100644
--- a/dockerfile-kasm-sublime-text
+++ b/dockerfile-kasm-sublime-text
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-super-tux-kart b/dockerfile-kasm-super-tux-kart
index 0132a47..44bb633 100644
--- a/dockerfile-kasm-super-tux-kart
+++ b/dockerfile-kasm-super-tux-kart
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-telegram b/dockerfile-kasm-telegram
index 392f36c..9b58437 100644
--- a/dockerfile-kasm-telegram
+++ b/dockerfile-kasm-telegram
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-terminal b/dockerfile-kasm-terminal
index cc62b43..a16e41c 100644
--- a/dockerfile-kasm-terminal
+++ b/dockerfile-kasm-terminal
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-thunderbird b/dockerfile-kasm-thunderbird
index 9fd2e61..6c86154 100644
--- a/dockerfile-kasm-thunderbird
+++ b/dockerfile-kasm-thunderbird
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-tor-browser b/dockerfile-kasm-tor-browser
index 1312a2e..d4cee8e 100644
--- a/dockerfile-kasm-tor-browser
+++ b/dockerfile-kasm-tor-browser
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-ubuntu-focal-desktop b/dockerfile-kasm-ubuntu-focal-desktop
deleted file mode 100644
index 12fd841..0000000
--- a/dockerfile-kasm-ubuntu-focal-desktop
+++ /dev/null
@@ -1,60 +0,0 @@
-ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
-FROM kasmweb/$BASE_IMAGE:$BASE_TAG
-
-USER root
-
-ENV HOME /home/kasm-default-profile
-ENV STARTUPDIR /dockerstartup
-WORKDIR $HOME
-
-### Envrionment config
-ENV DEBIAN_FRONTEND=noninteractive \
-    SKIP_CLEAN=true \
-    KASM_RX_HOME=$STARTUPDIR/kasmrx \
-    DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \
-    INST_DIR=$STARTUPDIR/install \
-    INST_SCRIPTS="/ubuntu/install/tools/install_tools_deluxe.sh \
-                  /ubuntu/install/misc/install_tools.sh \
-                  /ubuntu/install/chrome/install_chrome.sh \
-                  /ubuntu/install/chromium/install_chromium.sh \
-                  /ubuntu/install/firefox/install_firefox.sh \
-                  /ubuntu/install/sublime_text/install_sublime_text.sh \
-                  /ubuntu/install/vs_code/install_vs_code.sh \
-                  /ubuntu/install/nextcloud/install_nextcloud.sh \
-                  /ubuntu/install/remmina/install_remmina.sh \
-                  /ubuntu/install/only_office/install_only_office.sh \
-                  /ubuntu/install/signal/install_signal.sh \
-                  /ubuntu/install/gimp/install_gimp.sh \
-                  /ubuntu/install/zoom/install_zoom.sh \
-                  /ubuntu/install/obs/install_obs.sh \
-                  /ubuntu/install/ansible/install_ansible.sh \
-                  /ubuntu/install/terraform/install_terraform.sh \
-                  /ubuntu/install/telegram/install_telegram.sh \
-                  /ubuntu/install/thunderbird/install_thunderbird.sh \
-                  /ubuntu/install/slack/install_slack.sh \
-                  /ubuntu/install/gamepad_utils/install_gamepad_utils.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-ubuntu-focal-dind b/dockerfile-kasm-ubuntu-focal-dind
deleted file mode 100644
index e02fd6c..0000000
--- a/dockerfile-kasm-ubuntu-focal-dind
+++ /dev/null
@@ -1,51 +0,0 @@
-ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
-FROM kasmweb/$BASE_IMAGE:$BASE_TAG
-USER root
-
-ENV HOME /home/kasm-default-profile
-ENV STARTUPDIR /dockerstartup
-WORKDIR $HOME
-
-### Envrionment config
-ENV DEBUG=false \
-    DEBIAN_FRONTEND=noninteractive \
-    SKIP_CLEAN=true \
-    KASM_RX_HOME=$STARTUPDIR/kasmrx \
-    DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \
-    INST_DIR=$STARTUPDIR/install \
-    INST_SCRIPTS="/ubuntu/install/dind/install_dind.sh \
-                  /ubuntu/install/tools/install_tools_deluxe.sh \
-                  /ubuntu/install/misc/install_tools.sh \
-                  /ubuntu/install/chrome/install_chrome.sh \
-                  /ubuntu/install/chromium/install_chromium.sh \
-                  /ubuntu/install/sublime_text/install_sublime_text.sh \
-                  /ubuntu/install/vs_code/install_vs_code.sh \
-                  /ubuntu/install/cleanup/cleanup.sh"
-
-# Startup Scripts
-COPY ./src/ubuntu/install/dind/custom_startup.sh $STARTUPDIR/custom_startup.sh
-RUN chmod 755 $STARTUPDIR/custom_startup.sh
-COPY ./src/ubuntu/install/dind/dockerd.conf /etc/supervisor/conf.d/
-
-# 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-ubuntu-focal-dind-rootless b/dockerfile-kasm-ubuntu-focal-dind-rootless
deleted file mode 100644
index a59f989..0000000
--- a/dockerfile-kasm-ubuntu-focal-dind-rootless
+++ /dev/null
@@ -1,57 +0,0 @@
-ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
-FROM kasmweb/$BASE_IMAGE:$BASE_TAG
-USER root
-
-ENV HOME /home/kasm-default-profile
-ENV STARTUPDIR /dockerstartup
-ENV INST_SCRIPTS $STARTUPDIR/install
-WORKDIR $HOME
-
-# Rootless Dind
-COPY ./src/ubuntu/install/dind_rootless/install_dind_rootless.sh $INST_SCRIPTS/dind_rootless/
-RUN bash $INST_SCRIPTS/dind_rootless/install_dind_rootless.sh
-RUN rm -rf $INST_SCRIPTS/dind_rootless
-COPY ./src/ubuntu/install/dind_rootless/custom_startup.sh $STARTUPDIR/custom_startup.sh
-RUN chmod +x $STARTUPDIR/custom_startup.sh && chmod 755 $STARTUPDIR/custom_startup.sh
-COPY ./src/ubuntu/install/dind_rootless/modprobe /usr/local/bin/modprobe
-RUN chmod +x /usr/local/bin/modprobe
-ENV XDG_RUNTIME_DIR=/docker \
-    DOCKER_HOST=unix:///docker/docker.sock
-RUN mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR
-
-### Envrionment config
-ENV DEBIAN_FRONTEND=noninteractive \
-    SKIP_CLEAN=true \
-    KASM_RX_HOME=$STARTUPDIR/kasmrx \
-    DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \
-    INST_DIR=$STARTUPDIR/install \
-    INST_SCRIPTS="/ubuntu/install/tools/install_tools_deluxe.sh \
-                  /ubuntu/install/misc/install_tools.sh \
-                  /ubuntu/install/chrome/install_chrome.sh \
-                  /ubuntu/install/chromium/install_chromium.sh \
-                  /ubuntu/install/sublime_text/install_sublime_text.sh \
-                  /ubuntu/install/vs_code/install_vs_code.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-ubuntu-focal-desktop-vpn b/dockerfile-kasm-ubuntu-jammy-desktop-vpn
similarity index 98%
rename from dockerfile-kasm-ubuntu-focal-desktop-vpn
rename to dockerfile-kasm-ubuntu-jammy-desktop-vpn
index 14d265d..acfbf86 100644
--- a/dockerfile-kasm-ubuntu-focal-desktop-vpn
+++ b/dockerfile-kasm-ubuntu-jammy-desktop-vpn
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 
 USER root
diff --git a/dockerfile-kasm-unityhub b/dockerfile-kasm-unityhub
index 611b8bd..7a36aa3 100644
--- a/dockerfile-kasm-unityhub
+++ b/dockerfile-kasm-unityhub
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-vivaldi b/dockerfile-kasm-vivaldi
index 0881b3f..39baf0a 100644
--- a/dockerfile-kasm-vivaldi
+++ b/dockerfile-kasm-vivaldi
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-vlc b/dockerfile-kasm-vlc
index cd040cb..4c2412a 100644
--- a/dockerfile-kasm-vlc
+++ b/dockerfile-kasm-vlc
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-vs-code b/dockerfile-kasm-vs-code
index cc1b0a1..64973bc 100644
--- a/dockerfile-kasm-vs-code
+++ b/dockerfile-kasm-vs-code
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
diff --git a/dockerfile-kasm-zsnes b/dockerfile-kasm-zsnes
index 548d481..6844aee 100644
--- a/dockerfile-kasm-zsnes
+++ b/dockerfile-kasm-zsnes
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-ubuntu-focal"
+ARG BASE_IMAGE="core-ubuntu-jammy"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root