diff --git a/linux/advanced/vscode-server/android/Dockerfile b/linux/advanced/vscode-server/android/Dockerfile
index 12d926312..783367868 100644
--- a/linux/advanced/vscode-server/android/Dockerfile
+++ b/linux/advanced/vscode-server/android/Dockerfile
@@ -1,7 +1,7 @@
 ################################################################################
 # https://github.com/linuxserver/docker-code-server/pkgs/container/code-server
 ################################################################################
-FROM quay.io/epicmorg/vscode-server:latest
+FROM quay.io/epicmorg/vscode-server:cpp
 
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
diff --git a/linux/advanced/vscode-server/android/docker-compose.yml b/linux/advanced/vscode-server/android/docker-compose.yml
index 246ab4b92..44dfaec6a 100644
--- a/linux/advanced/vscode-server/android/docker-compose.yml
+++ b/linux/advanced/vscode-server/android/docker-compose.yml
@@ -3,7 +3,3 @@ services:
     image: "quay.io/epicmorg/vscode-server:android"
     build:
       context: .
-  app-jdk17:
-    image: "quay.io/epicmorg/debian:bookworm-develop-jdk17"
-    build:
-      context: .
diff --git a/linux/advanced/vscode-server/cpp/Dockerfile b/linux/advanced/vscode-server/cpp/Dockerfile
index a20682d6f..ef5aabe6c 100644
--- a/linux/advanced/vscode-server/cpp/Dockerfile
+++ b/linux/advanced/vscode-server/cpp/Dockerfile
@@ -256,6 +256,8 @@ RUN apt-get update && \
     autopkgtest \
     gcc-multilib \
     g++-multilib \
+    clang \
+    pkg-config \ 
     libxkbcommon-dev \
     zlib1g-dev \
     libfreetype6-dev \
diff --git a/linux/advanced/vscode-server/latest/Dockerfile b/linux/advanced/vscode-server/latest/Dockerfile
index 27e991196..d163f095b 100644
--- a/linux/advanced/vscode-server/latest/Dockerfile
+++ b/linux/advanced/vscode-server/latest/Dockerfile
@@ -78,13 +78,6 @@ ENV GOSU_VERSION=1.17
 ARG GOSU_BIN_DIR=${EMG_LOCAL_BASE_DIR}/gosu/${GOSU_VERSION}/bin
 ARG GOSU_DOWNLOAD_URL=https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64
 
-ENV FLUTTER_VERSION=3.29.2
-ENV FLUTTER_CHANNEL=stable
-ENV FLUTTER_DIR=${EMG_LOCAL_BASE_DIR}/flutter/${FLUTTER_VERSION}
-ARG FLUTTER_BIN_DIR=${FLUTTER_DIR}/bin
-ARG FLUTTER_DOWNLOAD_URL=https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz
-ARG FLUTTER_TEMP=/tmp/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz
-
 ENV BuildDocker true
 
 ##################################################################
@@ -217,30 +210,6 @@ RUN echo "=============================================" && \
     echo 7z $(7z | head -4) && \
     echo "============================================="
 
-##################################################################
-#                   Flutter SDK
-##################################################################
-RUN mkdir -p ${FLUTTER_DIR}
-ADD ${FLUTTER_DOWNLOAD_URL} /tmp
-
-RUN tar -xf ${FLUTTER_TEMP} --directory ${FLUTTER_DIR} --strip-components=1 && \
-    chmod +x ${FLUTTER_BIN_DIR}/dart && \
-    chmod +x ${FLUTTER_BIN_DIR}/flutter && \
-    chmod +x ${FLUTTER_BIN_DIR}/internal/shared.sh && \
-    chmod +x ${FLUTTER_BIN_DIR}/internal/update_dart_sdk.sh
-
-ENV PATH="${FLUTTER_BIN_DIR}:${PATH}"
-
-RUN git config --global --add safe.directory ${FLUTTER_DIR} && \
-    flutter precache && \
-    flutter config --no-analytics && \
-    dart --disable-analytics
-
-RUN echo "=============================================" && \
-    echo dart $(dart --version) && \
-    echo flutter $(flutter --version) && \
-    echo "============================================="
-
 ##################################################################
 #                   Install LazyGit official binary
 ##################################################################