diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3892e57451c51d05fc811f7659e04774241254ff..63f544f0694932ae3bd471c7ae7fc64fd224303e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,5 @@
-# The devcontainer will be based on debian
 # The base container already has entrypoint, vscode user account, etc. out of the box
-FROM mcr.microsoft.com/vscode/devcontainers/base:bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu-22.04
 
 # Set permissions for mounts in devcontainer.json
 RUN mkdir -p /home/vscode/.vscode-server/bin
@@ -10,9 +9,11 @@ RUN chown -R vscode:vscode /home/vscode/.vscode-server
 # Adjust this list based on your demands
 RUN apt-get update \
     && apt-get upgrade -y \
-    && apt-get install -y --no-install-recommends \
+    && apt-get install -y \
     sshpass \
     curl \
+    wget \
+    openssl \
     iputils-ping \
     htop \
     zsh \
@@ -21,10 +22,11 @@ RUN apt-get update \
     tmux \
     nload \
     yamllint \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -Rf /usr/share/doc && rm -Rf /usr/share/man \
     && apt-get clean
 
+# Install gnmic
+RUN bash -c "$(curl -sL https://get-gnmic.openconfig.net)"
+
 # Install oh-my-zsh for more terminal features and set is as primary shell
 ENV SHELL /bin/zsh
 RUN wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | zsh || true
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d04d543195bb098da64d048f3a7bdd2e2b2acfc5..7bf6642aa4c21767f57f43ee9c6b4e6ada229532 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -10,7 +10,8 @@
                     "version": "1.21"
                 },
             "ghcr.io/devcontainers/features/docker-in-docker:2.7": {
-                    "version": "latest"
+                "version": "latest",
+                "dockerDashComposeVersion": "v2"
                 }
         },
         // add any required extensions that must be pre-installed in the devcontainer