diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml
index d5c07ac..7a89cef 100644
--- a/ci-scripts/template-vars.yaml
+++ b/ci-scripts/template-vars.yaml
@@ -475,12 +475,12 @@ multiImages:
       - src/ubuntu/install/cleanup/**
       - src/ubuntu/install/chromium/**
       - src/ubuntu/install/slack/**
-  - name: parrotos-5-desktop
+  - name: parrotos-6-desktop
     singleapp: false
-    base: core-parrotos-5
-    dockerfile: dockerfile-kasm-parrotos-5-desktop
+    base: core-parrotos-6
+    dockerfile: dockerfile-kasm-parrotos-6-desktop
     changeFiles:
-      - dockerfile-kasm-parrotos-5-desktop
+      - dockerfile-kasm-parrotos-6-desktop
       - src/ubuntu/install/parrot/**
       - src/ubuntu/install/firefox/**
       - src/ubuntu/install/cleanup/**
diff --git a/dockerfile-kasm-parrotos-5-desktop b/dockerfile-kasm-parrotos-6-desktop
similarity index 91%
rename from dockerfile-kasm-parrotos-5-desktop
rename to dockerfile-kasm-parrotos-6-desktop
index 09e7904..729ca05 100644
--- a/dockerfile-kasm-parrotos-5-desktop
+++ b/dockerfile-kasm-parrotos-6-desktop
@@ -1,5 +1,5 @@
 ARG BASE_TAG="develop"
-ARG BASE_IMAGE="core-parrotos-5"
+ARG BASE_IMAGE="core-parrotos-6"
 FROM kasmweb/$BASE_IMAGE:$BASE_TAG
 USER root
 
@@ -15,6 +15,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
     INST_DIR=$STARTUPDIR/install \
     INST_SCRIPTS="/ubuntu/install/parrot/install_parrot.sh \
                   /ubuntu/install/chromium/install_chromium.sh \
+                  /ubuntu/install/vs_code/install_vs_code.sh \
                   /ubuntu/install/firefox/install_firefox.sh \
                   /ubuntu/install/cleanup/cleanup.sh"
 
diff --git a/docs/parrotos-5-desktop/description.txt b/docs/parrotos-5-desktop/description.txt
deleted file mode 100644
index fd1f48a..0000000
--- a/docs/parrotos-5-desktop/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Parrot OS 5 desktop for Kasm Workspaces
diff --git a/docs/parrotos-5-desktop/README.md b/docs/parrotos-6-desktop/README.md
similarity index 78%
rename from docs/parrotos-5-desktop/README.md
rename to docs/parrotos-6-desktop/README.md
index 4397b12..1fd23ff 100644
--- a/docs/parrotos-5-desktop/README.md
+++ b/docs/parrotos-6-desktop/README.md
@@ -1,6 +1,6 @@
 # About This Image
 
-This Image contains a browser-accessible Parrot OS 5 Desktop with various productivity and development apps installed.
+This Image contains a browser-accessible Parrot OS 6 Desktop with various productivity and development apps installed.
 
 ![Screenshot][Image_Screenshot]
 
diff --git a/docs/parrotos-5-desktop/demo.txt b/docs/parrotos-6-desktop/demo.txt
similarity index 100%
rename from docs/parrotos-5-desktop/demo.txt
rename to docs/parrotos-6-desktop/demo.txt
diff --git a/docs/parrotos-6-desktop/description.txt b/docs/parrotos-6-desktop/description.txt
new file mode 100644
index 0000000..0779e1e
--- /dev/null
+++ b/docs/parrotos-6-desktop/description.txt
@@ -0,0 +1 @@
+Parrot OS 6 desktop for Kasm Workspaces
diff --git a/src/ubuntu/install/cleanup/cleanup.sh b/src/ubuntu/install/cleanup/cleanup.sh
index 69f9274..b530370 100644
--- a/src/ubuntu/install/cleanup/cleanup.sh
+++ b/src/ubuntu/install/cleanup/cleanup.sh
@@ -8,7 +8,7 @@ elif [[ "${DISTRO}" == @(almalinux8|almalinux9|fedora37|fedora38|fedora39|oracle
   dnf clean all
 elif [ "${DISTRO}" == "opensuse" ]; then
   zypper clean --all
-elif [[ "${DISTRO}" == @(debian|kali|parrotos5|ubuntu) ]]; then
+elif [[ "${DISTRO}" == @(debian|kali|parrotos6|ubuntu) ]]; then
   apt-get autoremove -y
   apt-get autoclean -y
 fi
diff --git a/src/ubuntu/install/parrot/install_parrot.sh b/src/ubuntu/install/parrot/install_parrot.sh
index f358642..2c90502 100644
--- a/src/ubuntu/install/parrot/install_parrot.sh
+++ b/src/ubuntu/install/parrot/install_parrot.sh
@@ -21,7 +21,8 @@ apt-get install -y \
   parrot-tools-forensics \
   parrot-tools-reversing \
   parrot-tools-cloud \
-  powershell-empire-
+  powershell-empire- \
+  codium-
 
 # Disable power manager
 rm -f /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop
diff --git a/src/ubuntu/install/vpn/install_vpn.sh b/src/ubuntu/install/vpn/install_vpn.sh
index 6f86095..102d610 100644
--- a/src/ubuntu/install/vpn/install_vpn.sh
+++ b/src/ubuntu/install/vpn/install_vpn.sh
@@ -2,7 +2,7 @@
 set -ex
 
 # Install OpenVPN/Wireguard deps
-if [[ "${DISTRO}" == @(ubuntu|kali|debian|parrotos5) ]]; then
+if [[ "${DISTRO}" == @(ubuntu|kali|debian|parrotos6) ]]; then
   echo "resolvconf resolvconf/linkify-resolvconf boolean false" | debconf-set-selections
   apt-get update
   apt-get install -y --no-install-recommends \