diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml
index 9e58364..e0c676f 100644
--- a/ci-scripts/template-vars.yaml
+++ b/ci-scripts/template-vars.yaml
@@ -6,14 +6,14 @@ files: &UNIVERSAL_CHANGE_FILES
 multiImages:
   - name: audacity
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-audacity
     changeFiles:
       - dockerfile-kasm-audacity
       - src/ubuntu/install/audacity/**
   - name: chromium
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-chromium
     changeFiles:
       - dockerfile-kasm-chromium
@@ -22,28 +22,28 @@ multiImages:
       - src/ubuntu/install/certificates/**
   - name: deluge
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-deluge
     changeFiles:
       - dockerfile-kasm-deluge
       - src/ubuntu/install/deluge/**
   - name: doom
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-doom
     changeFiles:
       - dockerfile-kasm-doom
       - src/ubuntu/install/doom/**
   - name: filezilla
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-filezilla
     changeFiles:
       - dockerfile-kasm-filezilla
       - src/ubuntu/install/filezilla/**
   - name: firefox
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-firefox
     changeFiles:
       - dockerfile-kasm-firefox
@@ -52,21 +52,21 @@ multiImages:
       - src/ubuntu/install/certificates/**
   - name: gimp
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-gimp
     changeFiles:
       - dockerfile-kasm-gimp
       - src/ubuntu/install/gimp/**
   - name: inkscape
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-inkscape
     changeFiles:
       - dockerfile-kasm-inkscape
       - src/ubuntu/install/inkscape/**
   - name: java-dev
     singleapp: false
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-java-dev
     changeFiles:
       - dockerfile-kasm-java-dev
@@ -80,14 +80,14 @@ multiImages:
       - src/ubuntu/install/eclipse/**
   - name: libre-office
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-libre-office
     changeFiles:
       - dockerfile-kasm-libre-office
       - src/ubuntu/install/libre_office/**
   - name: nessus
     singleapp: false
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-nessus
     changeFiles:
       - dockerfile-kasm-nessus
@@ -126,14 +126,14 @@ multiImages:
       - src/ubuntu/install/slack/**
   - name: pinta
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-pinta
     changeFiles:
       - dockerfile-kasm-pinta
       - src/ubuntu/install/pinta/**
   - name: qbittorrent
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-qbittorrent
     changeFiles:
       - dockerfile-kasm-qbittorrent
@@ -155,14 +155,14 @@ multiImages:
       - src/ubuntu/install/cleanup/**
   - name: remmina
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-remmina
     changeFiles:
       - dockerfile-kasm-remmina
       - 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
@@ -407,7 +380,7 @@ multiImages:
       - src/alpine/install/**
   - name: brave
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-brave
     changeFiles:
       - dockerfile-kasm-brave
@@ -500,7 +473,7 @@ multiImages:
       - src/ubuntu/install/chromium/**
   - name: maltego
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-maltego
     changeFiles:
       - dockerfile-kasm-maltego
@@ -508,7 +481,7 @@ multiImages:
       - src/ubuntu/install/firefox/**
   - name: minetest
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-minetest
     changeFiles:
       - dockerfile-kasm-minetest
@@ -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
@@ -688,14 +633,14 @@ multiImages:
 singleImages:
   - name: blender
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-blender
     changeFiles:
       - dockerfile-kasm-blender
       - src/ubuntu/install/blender/**
   - name: chrome
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-chrome
     changeFiles:
       - dockerfile-kasm-chrome
@@ -704,7 +649,7 @@ singleImages:
       - src/ubuntu/install/chrome/**
   - name: desktop
     singleapp: false
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-desktop
     changeFiles:
       - dockerfile-kasm-desktop
@@ -713,7 +658,7 @@ singleImages:
       - src/ubuntu/install/chrome/**
   - name: desktop-deluxe
     singleapp: false
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-desktop-deluxe
     changeFiles:
       - dockerfile-kasm-desktop-deluxe
@@ -736,14 +681,14 @@ singleImages:
       - src/ubuntu/install/chrome/**
   - name: discord
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-discord
     changeFiles:
       - dockerfile-kasm-discord
       - src/ubuntu/install/discord/**
   - name: edge
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-edge
     changeFiles:
       - dockerfile-kasm-edge
@@ -751,7 +696,7 @@ singleImages:
       - src/ubuntu/install/edge/**
   - name: hunchly
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-hunchly
     changeFiles:
       - dockerfile-kasm-hunchly
@@ -766,7 +711,7 @@ singleImages:
       - src/ubuntu/install/insomnia/**
   - name: only-office
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-only-office
     changeFiles:
       - dockerfile-kasm-only-office
@@ -792,30 +737,22 @@ singleImages:
       - src/ubuntu/install/cleanup/**
   - name: postman
     singleapp: true
-    base: core-ubuntu-focal
+    base: core-ubuntu-jammy
     dockerfile: dockerfile-kasm-postman
     changeFiles:
       - dockerfile-kasm-postman
       - src/ubuntu/install/chrome/**
       - src/ubuntu/install/postman/**
-  - name: remnux-focal-desktop
-    singleapp: false
-    base: core-ubuntu-focal
-    dockerfile: dockerfile-kasm-remnux-focal-desktop
-    changeFiles:
-      - dockerfile-kasm-remnux-focal-desktop
-      - src/ubuntu/install/firefox/**
-      - 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 +762,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 +778,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 +787,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 +795,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-audacity b/dockerfile-kasm-audacity
index 7e15c35..0106584 100644
--- a/dockerfile-kasm-audacity
+++ b/dockerfile-kasm-audacity
@@ -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-blender b/dockerfile-kasm-blender
index 0afb290..a0da597 100644
--- a/dockerfile-kasm-blender
+++ b/dockerfile-kasm-blender
@@ -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-brave b/dockerfile-kasm-brave
index b036393..4245144 100644
--- a/dockerfile-kasm-brave
+++ b/dockerfile-kasm-brave
@@ -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-chrome b/dockerfile-kasm-chrome
index 4d917cd..148a107 100644
--- a/dockerfile-kasm-chrome
+++ b/dockerfile-kasm-chrome
@@ -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-chromium b/dockerfile-kasm-chromium
index 5c336ef..3b0c149 100644
--- a/dockerfile-kasm-chromium
+++ b/dockerfile-kasm-chromium
@@ -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-deluge b/dockerfile-kasm-deluge
index b4c5007..786db77 100644
--- a/dockerfile-kasm-deluge
+++ b/dockerfile-kasm-deluge
@@ -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-desktop b/dockerfile-kasm-desktop
index 2ae404c..31c2936 100644
--- a/dockerfile-kasm-desktop
+++ b/dockerfile-kasm-desktop
@@ -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-desktop-deluxe b/dockerfile-kasm-desktop-deluxe
index 89ec569..ab84ce6 100644
--- a/dockerfile-kasm-desktop-deluxe
+++ b/dockerfile-kasm-desktop-deluxe
@@ -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-discord b/dockerfile-kasm-discord
index 0ba3203..4ddfc99 100644
--- a/dockerfile-kasm-discord
+++ b/dockerfile-kasm-discord
@@ -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-doom b/dockerfile-kasm-doom
index 3003fc3..f0f00a7 100644
--- a/dockerfile-kasm-doom
+++ b/dockerfile-kasm-doom
@@ -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-edge b/dockerfile-kasm-edge
index 1381cc4..8b24f4c 100644
--- a/dockerfile-kasm-edge
+++ b/dockerfile-kasm-edge
@@ -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-filezilla b/dockerfile-kasm-filezilla
index daf6308..746012e 100644
--- a/dockerfile-kasm-filezilla
+++ b/dockerfile-kasm-filezilla
@@ -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-firefox b/dockerfile-kasm-firefox
index ca69d58..fc30051 100644
--- a/dockerfile-kasm-firefox
+++ b/dockerfile-kasm-firefox
@@ -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-gimp b/dockerfile-kasm-gimp
index 40cefb0..ca9e110 100644
--- a/dockerfile-kasm-gimp
+++ b/dockerfile-kasm-gimp
@@ -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-hunchly b/dockerfile-kasm-hunchly
index 4848164..650f27f 100644
--- a/dockerfile-kasm-hunchly
+++ b/dockerfile-kasm-hunchly
@@ -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-inkscape b/dockerfile-kasm-inkscape
index 3140c99..0762b82 100644
--- a/dockerfile-kasm-inkscape
+++ b/dockerfile-kasm-inkscape
@@ -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-java-dev b/dockerfile-kasm-java-dev
index 32d97e6..6db7b39 100644
--- a/dockerfile-kasm-java-dev
+++ b/dockerfile-kasm-java-dev
@@ -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-libre-office b/dockerfile-kasm-libre-office
index eb837a0..3fa10f6 100644
--- a/dockerfile-kasm-libre-office
+++ b/dockerfile-kasm-libre-office
@@ -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-maltego b/dockerfile-kasm-maltego
index 3558a06..a5f3819 100644
--- a/dockerfile-kasm-maltego
+++ b/dockerfile-kasm-maltego
@@ -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-minetest b/dockerfile-kasm-minetest
index 82c8b43..2b05509 100644
--- a/dockerfile-kasm-minetest
+++ b/dockerfile-kasm-minetest
@@ -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-nessus b/dockerfile-kasm-nessus
index 2dc25fc..8324ee9 100644
--- a/dockerfile-kasm-nessus
+++ b/dockerfile-kasm-nessus
@@ -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-only-office b/dockerfile-kasm-only-office
index c8db558..7d2a5d9 100644
--- a/dockerfile-kasm-only-office
+++ b/dockerfile-kasm-only-office
@@ -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-pinta b/dockerfile-kasm-pinta
index c29de9e..5dce882 100644
--- a/dockerfile-kasm-pinta
+++ b/dockerfile-kasm-pinta
@@ -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-postman b/dockerfile-kasm-postman
index 4af4509..6abb02b 100644
--- a/dockerfile-kasm-postman
+++ b/dockerfile-kasm-postman
@@ -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-qbittorrent b/dockerfile-kasm-qbittorrent
index 01834ca..fa4f4f9 100644
--- a/dockerfile-kasm-qbittorrent
+++ b/dockerfile-kasm-qbittorrent
@@ -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-remmina b/dockerfile-kasm-remmina
index 721ccc4..69d5f2a 100644
--- a/dockerfile-kasm-remmina
+++ b/dockerfile-kasm-remmina
@@ -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-remnux-focal-desktop b/dockerfile-kasm-remnux-focal-desktop
deleted file mode 100644
index 6134d39..0000000
--- a/dockerfile-kasm-remnux-focal-desktop
+++ /dev/null
@@ -1,33 +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
-
-######### Customize Container Here ###########
-
-# Add Background
-ADD /src/common/resources/images/bg_remnux.png  /usr/share/backgrounds/bg_default.png
-
-# Install Remnux Utils
-COPY ./src/ubuntu/install/remnux $INST_SCRIPTS/remnux/
-RUN bash $INST_SCRIPTS/remnux/install_remnux.sh && rm -rf $INST_SCRIPTS/remnux/
-
-# Install Firefox
-COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/
-RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/
-
-######### End Customizations ###########
-
-RUN chown 1000:0 $HOME
-RUN $STARTUPDIR/set_user_permission.sh $HOME
-
-ENV HOME /home/kasm-user
-WORKDIR $HOME
-RUN mkdir -p $HOME && chown -R 1000:0 $HOME
-
-USER 1000
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
 
diff --git a/docs/desktop-deluxe/README.md b/docs/desktop-deluxe/README.md
index 5d46f44..f02beb6 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 Focal Desktop with various productivity and development apps installed.
+This Image contains a browser-accessible Ubuntu Jammy Desktop with various productivity and development apps installed.
 
 ![Screenshot][Image_Screenshot]
 
diff --git a/docs/desktop/README.md b/docs/desktop/README.md
index a9a9ff2..7a4bd40 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 Focal Desktop with Chrome and Firefox installed.
+This Image contains a browser-accessible Ubuntu Jammy Desktop with Chrome and Firefox installed.
 
 ![Screenshot][Image_Screenshot]
 
diff --git a/docs/java-dev/README.md b/docs/java-dev/README.md
index e281aaf..438744a 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 Focal Desktop with a Java development environment.
+This Image contains a browser-accessible Ubuntu Jammy Desktop with a Java development environment.
 
 ![Screenshot][Image_Screenshot]
 
diff --git a/docs/remnux-focal-desktop/README.md b/docs/remnux-focal-desktop/README.md
deleted file mode 100644
index 6a74d2a..0000000
--- a/docs/remnux-focal-desktop/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible Remnux Focal Desktop with various productivity and development apps installed.
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://info.kasmweb.com/hubfs/dockerhub/image-screenshots/remnux-focal-desktop.png "Image Screenshot"
diff --git a/docs/remnux-focal-desktop/demo.txt b/docs/remnux-focal-desktop/demo.txt
deleted file mode 100644
index 0b606c7..0000000
--- a/docs/remnux-focal-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/remnux-focal-desktop/description.txt b/docs/remnux-focal-desktop/description.txt
deleted file mode 100644
index 64b3eb1..0000000
--- a/docs/remnux-focal-desktop/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Remnux Focal desktop for Kasm Workspaces
diff --git a/docs/ubuntu-focal-desktop-vpn/README.md b/docs/ubuntu-focal-desktop-vpn/README.md
deleted file mode 100644
index f5f6c90..0000000
--- a/docs/ubuntu-focal-desktop-vpn/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible Ubuntu Focal Desktop with various productivity, development, and VPN  apps installed.
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/image-screenshots/ubuntu-focal-desktop.png "Image Screenshot"
diff --git a/docs/ubuntu-focal-desktop/README.md b/docs/ubuntu-focal-desktop/README.md
deleted file mode 100644
index 8e2d681..0000000
--- a/docs/ubuntu-focal-desktop/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible Ubuntu Focal Desktop with various productivity and development apps installed.
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/image-screenshots/ubuntu-focal-desktop.png "Image Screenshot"
\ No newline at end of file
diff --git a/docs/ubuntu-focal-desktop/demo.txt b/docs/ubuntu-focal-desktop/demo.txt
deleted file mode 100644
index 5f8e2fd..0000000
--- a/docs/ubuntu-focal-desktop/demo.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Live Demo
-
-<a href="https://app.kasmweb.com/#/cast/5124887069" target="_blank"><img src="https://info.kasmweb.com/hubfs/dockerhub/GIFs/ubuntu-focal-desktop.gif" width="640" height="360"></a>
-
-**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/5124887069" target="_blank">Live Demo</a>.
-
-<a href="https://app.kasmweb.com/#/cast/5124887069" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/UbuntuFocalDesktop.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/ubuntu-focal-desktop/description.txt b/docs/ubuntu-focal-desktop/description.txt
deleted file mode 100644
index 91d23d4..0000000
--- a/docs/ubuntu-focal-desktop/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ubuntu productivity desktop for Kasm Workspaces
\ No newline at end of file
diff --git a/docs/ubuntu-focal-dind-rootless/README.md b/docs/ubuntu-focal-dind-rootless/README.md
deleted file mode 100644
index 82c1142..0000000
--- a/docs/ubuntu-focal-dind-rootless/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible version of [Docker](https://www.docker.com/) running as a normal, non-root user.
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/ubuntu_dind.jpg "Image Screenshot"
-
-See [Kasm Docs](https://kasmweb.com/docs/latest/how_to/docker_in_kasm.html) for additional setup instructions.
-
-# Environment Variables
-
-* `APP_ARGS` - Additional arguments to pass to the application when launched.
diff --git a/docs/ubuntu-focal-dind-rootless/demo.txt b/docs/ubuntu-focal-dind-rootless/demo.txt
deleted file mode 100644
index 4cb0adc..0000000
--- a/docs/ubuntu-focal-dind-rootless/demo.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Live Demo
-
-**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/5005607527" target="_blank">Live Demo</a>.
-
-<a href="https://app.kasmweb.com/#/cast/5005607527" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/UbuntuFocalD-in-D.png" width="300" height="104"></a>
-
-&lowast;*Docker will not be functional in the demo for security reasons.*
-
-&lowast;*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.*
diff --git a/docs/ubuntu-focal-dind-rootless/description.txt b/docs/ubuntu-focal-dind-rootless/description.txt
deleted file mode 100644
index f976460..0000000
--- a/docs/ubuntu-focal-dind-rootless/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Rootless Docker for Kasm Workspaces
\ No newline at end of file
diff --git a/docs/ubuntu-focal-dind/README.md b/docs/ubuntu-focal-dind/README.md
deleted file mode 100644
index 5abddde..0000000
--- a/docs/ubuntu-focal-dind/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# About This Image
-
-This Image contains a browser-accessible version of [Docker](https://www.docker.com/).
-
-![Screenshot][Image_Screenshot]
-
-[Image_Screenshot]: https://f.hubspotusercontent30.net/hubfs/5856039/dockerhub/ubuntu_dind.jpg "Image Screenshot"
-
-See [Kasm Docs](https://kasmweb.com/docs/latest/how_to/docker_in_kasm.html) for additional setup instructions.
-
-# Environment Variables
-
-* `APP_ARGS` - Additional arguments to pass to the application when launched.
diff --git a/docs/ubuntu-focal-dind/demo.txt b/docs/ubuntu-focal-dind/demo.txt
deleted file mode 100644
index 7bc9cba..0000000
--- a/docs/ubuntu-focal-dind/demo.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Live Demo
-
-**Launch a real-time demo in a new browser window:** <a href="https://app.kasmweb.com/#/cast/4824600187" target="_blank">Live Demo</a>.
-
-<a href="https://app.kasmweb.com/#/cast/4824600187" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/UbuntuFocalD-in-D.png" width="300" height="104"></a>
-
-&lowast;*Docker will not be functional in the demo for security reasons.*
-
-&lowast;*Note: Demo is limited to 3 minutes and has upload/downloads restricted for security purposes.*
diff --git a/docs/ubuntu-focal-dind/description.txt b/docs/ubuntu-focal-dind/description.txt
deleted file mode 100644
index 3f8c02c..0000000
--- a/docs/ubuntu-focal-dind/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Docker for Kasm Workspaces
\ No newline at end of file
diff --git a/docs/ubuntu-jammy-desktop-vpn/README.md b/docs/ubuntu-jammy-desktop-vpn/README.md
new file mode 100644
index 0000000..4378ff9
--- /dev/null
+++ b/docs/ubuntu-jammy-desktop-vpn/README.md
@@ -0,0 +1,7 @@
+# About This Image
+
+This Image contains a browser-accessible Ubuntu Jammy Desktop with various productivity, development, and VPN  apps installed.
+
+![Screenshot][Image_Screenshot]
+
+[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/ubuntu_jammy_desktop.png "Image Screenshot"
diff --git a/docs/ubuntu-focal-desktop-vpn/demo.txt b/docs/ubuntu-jammy-desktop-vpn/demo.txt
similarity index 82%
rename from docs/ubuntu-focal-desktop-vpn/demo.txt
rename to docs/ubuntu-jammy-desktop-vpn/demo.txt
index 5f8e2fd..4d5807e 100644
--- a/docs/ubuntu-focal-desktop-vpn/demo.txt
+++ b/docs/ubuntu-jammy-desktop-vpn/demo.txt
@@ -1,9 +1,9 @@
 # Live Demo
 
-<a href="https://app.kasmweb.com/#/cast/5124887069" target="_blank"><img src="https://info.kasmweb.com/hubfs/dockerhub/GIFs/ubuntu-focal-desktop.gif" width="640" height="360"></a>
+<a href="https://app.kasmweb.com/#/cast/5124887069" 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/5124887069" target="_blank">Live Demo</a>.
 
-<a href="https://app.kasmweb.com/#/cast/5124887069" target="_blank"><img src="https://5856039.fs1.hubspotusercontent-na1.net/hub/5856039/hubfs/dockerhub/casting-buttons/UbuntuFocalDesktop.png" width="300" height="104"></a>
+<a href="https://app.kasmweb.com/#/cast/5124887069" 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/ubuntu-focal-desktop-vpn/description.txt b/docs/ubuntu-jammy-desktop-vpn/description.txt
similarity index 100%
rename from docs/ubuntu-focal-desktop-vpn/description.txt
rename to docs/ubuntu-jammy-desktop-vpn/description.txt
diff --git a/src/ubuntu/install/pinta/install_pinta.sh b/src/ubuntu/install/pinta/install_pinta.sh
index 02fc1fb..9192b40 100644
--- a/src/ubuntu/install/pinta/install_pinta.sh
+++ b/src/ubuntu/install/pinta/install_pinta.sh
@@ -2,12 +2,47 @@
 set -ex
 
 # Install Pinta
-apt-get update
-apt-get install -y pinta
+# For Jammy, build pinta from source because standard package is buggy
+if grep -q Jammy /etc/os-release;  then
+  # install requirements for building pinta from source
+  apt update -y
+  apt-get install -y dotnet-sdk-8.0
+  apt-get install -y libgtk-3-dev
+  apt install -y autotools-dev autoconf-archive gettext intltool libadwaita-1-dev
+  # download and install pinta 2.1.2 source
+  wget -q https://github.com/PintaProject/Pinta/releases/download/2.1.2/pinta-2.1.2.tar.gz -O /tmp/pinta-2.1.2.tar.gz
+  tar -xvzf /tmp/pinta-2.1.2.tar.gz -C /tmp/
+  cd /tmp/pinta-2.1.2
+  ./configure --prefix=/usr/local
+  make install
 
-# Default settings and desktop icon
-cp /usr/share/applications/pinta.desktop $HOME/Desktop/
-chmod +x $HOME/Desktop/pinta.desktop
+  # cleanup to reduce image size
+  rm -rf /tmp/pinta-2.1.2.tar.gz /tmp/pinta-2.1.2
+  apt remove -y libgtk-3-dev autotools-dev autoconf-archive gettext intltool libadwaita-1-dev
+  apt autoremove -y
+
+  # create desktop file
+  cat >/usr/share/applications/pinta.desktop <<EOL
+[Desktop Entry]
+Name=Pinta
+Comment=Simple Drawing/Editing Program
+Exec=/usr/local/bin/pinta
+Icon=/usr/local/share/icons/hicolor/96x96/apps/pinta.png
+Terminal=false
+Type=Application
+Categories=Graphics;2DGraphics;RasterGraphics;
+EOL
+  chmod +x /usr/share/applications/pinta.desktop
+  cp /usr/share/applications/pinta.desktop $HOME/Desktop/
+
+else
+  apt-get update
+  apt-get install -y pinta
+
+  # Default settings and desktop icon
+  cp /usr/share/applications/pinta.desktop $HOME/Desktop/
+  chmod +x $HOME/Desktop/pinta.desktop
+fi
 
 # Cleanup for app layer
 chown -R 1000:0 $HOME