diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml
index 343067e..dba959f 100644
--- a/ci-scripts/template-vars.yaml
+++ b/ci-scripts/template-vars.yaml
@@ -36,14 +36,14 @@ multiImages:
       - 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
@@ -500,7 +500,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 +508,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
@@ -704,7 +704,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
@@ -743,7 +743,7 @@ singleImages:
       - 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 +751,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 +766,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
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-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