diff --git a/.devcontainer/bazel/Dockerfile b/.devcontainer/bazel/Dockerfile
index 0f8f6f5b..a2f9f54c 100755
--- a/.devcontainer/bazel/Dockerfile
+++ b/.devcontainer/bazel/Dockerfile
@@ -21,7 +21,7 @@ RUN curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-
 
 RUN apt-get install -y pkg-config libasound2-dev
 
-RUN apt-get install -y libunistring-dev libldap-dev libkrb5-dev libgpg-error-dev gdb libc6-dbg libgtest-dev libbluetooth-dev
+RUN apt-get install -y libunistring-dev libldap-dev libkrb5-dev libgpg-error-dev gdb libc6-dbg libgtest-dev libbluetooth-dev clangd
 
 #gtest
 RUN apt-get update && apt-get install -y \
diff --git a/.devcontainer/bazel/devcontainer.json b/.devcontainer/bazel/devcontainer.json
index d5ca6a17..2e1782a8 100755
--- a/.devcontainer/bazel/devcontainer.json
+++ b/.devcontainer/bazel/devcontainer.json
@@ -4,15 +4,9 @@
   "customizations": {
     "vscode": {
       "settings": {
-        "C_Cpp.default.configurationProvider": "ms-vscode.cpptools",
         "C_Cpp.intelliSenseEngine": "Default"
       },
-      "extensions": [
-        "ms-vscode.cpptools",
-        "bazelbuild.vscode-bazel",
-        "ms-vscode.cpptools-extension-pack"
-      ],
-
+      "extensions": ["bazelbuild.vscode-bazel"]
     }
   },
   "mounts": [
diff --git a/.devcontainer/bazelclion/Dockerfile b/.devcontainer/bazelclion/Dockerfile
index 5eab4c65..a2f9f54c 100755
--- a/.devcontainer/bazelclion/Dockerfile
+++ b/.devcontainer/bazelclion/Dockerfile
@@ -21,13 +21,16 @@ RUN curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-
 
 RUN apt-get install -y pkg-config libasound2-dev
 
-RUN apt-get install -y libunistring-dev libldap-dev libkrb5-dev libgpg-error-dev gdb libc6-dbg googletest
+RUN apt-get install -y libunistring-dev libldap-dev libkrb5-dev libgpg-error-dev gdb libc6-dbg libgtest-dev libbluetooth-dev clangd
 
 #gtest
-RUN cd /usr/src/googletest
-RUN cmake -S . -B build
-RUN cmake --build build -j
-RUN cmake --install build
+RUN apt-get update && apt-get install -y \
+    googletest cmake g++ make \
+    && rm -rf /var/lib/apt/lists/* \
+    && cd /usr/src/googletest \
+    && cmake -S . -B build \
+    && cmake --build build -j"$(nproc)" \
+    && cmake --install build
 
 # bash history
 RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhistory/.bash_history" \
diff --git a/.devcontainer/bazelclion/devcontainer.json b/.devcontainer/bazelclion/devcontainer.json
index 0fafd692..62755804 100755
--- a/.devcontainer/bazelclion/devcontainer.json
+++ b/.devcontainer/bazelclion/devcontainer.json
@@ -47,6 +47,9 @@
   "runArgs": [
     "--network=host",
     "--dns=1.1.1.1",
-    "--dns=8.8.8.8"
+    "--dns=8.8.8.8",
+    "--memory=8g",
+    "--cpus=6",
+    "--shm-size=2g"
   ]
 }