diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index cc820451d..b07979927 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -2,60 +2,68 @@ FROM mcr.microsoft.com/devcontainers/python:3.11-bookworm
 
 ARG CLAB_VERSION
 
+# Add the netdevops repository
 RUN echo "deb [trusted=yes] https://netdevops.fury.site/apt/ /" | \
     tee -a /etc/apt/sources.list.d/netdevops.list
 
-# setup keyring for github cli
-RUN sudo mkdir -p -m 755 /etc/apt/keyrings \
-    && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
-    && sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
-    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-
-# install containerlab and tools
-RUN apt update && apt install -y --no-install-recommends containerlab${CLAB_VERSION:+=$CLAB_VERSION} \
+# Install necessary packages, including curl
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    containerlab${CLAB_VERSION:+=$CLAB_VERSION} \
     direnv \
     btop \
-    gh \
     iputils-ping \
     tcpdump \
     iproute2 \
     qemu-kvm \
     dnsutils \
-    telnet
+    telnet \
+    curl
+
+# Install GitHub CLI directly from the latest release
+RUN bash -c 'VERSION=$(curl -s https://api.github.com/repos/cli/cli/releases/latest | \
+    grep -oP "\"tag_name\": \"\K[^\"]+") && \
+    CLEAN_VERSION=${VERSION#v} && \
+    DOWNLOAD_URL="https://github.com/cli/cli/releases/download/${VERSION}/gh_${CLEAN_VERSION}_linux_amd64.tar.gz" && \
+    curl -L "$DOWNLOAD_URL" | tar xz -C /tmp && \
+    mv /tmp/gh_${CLEAN_VERSION}_linux_amd64/bin/gh /usr/local/bin/ && \
+    chmod +x /usr/local/bin/gh && \
+    rm -rf /tmp/gh_${CLEAN_VERSION}_linux_amd64'
 
-# install gNMIc and gNOIc
-RUN bash -c "$(curl -sL https://get-gnmic.openconfig.net)" && bash -c "$(curl -sL https://get-gnoic.kmrd.dev)"
+# Install gNMIc and gNOIc
+RUN bash -c "$(curl -sL https://get-gnmic.openconfig.net)" && \
+    bash -c "$(curl -sL https://get-gnoic.kmrd.dev)"
 
-# add empty docker config files to avoid clab warnings for root user
+# Add empty docker config files to avoid clab warnings for root user
 RUN mkdir -p /root/.docker && echo "{}" > /root/.docker/config.json
 
-# maintain SSH_AUTH_SOCK env var when using sudo
+# Maintain SSH_AUTH_SOCK env var when using sudo
 RUN mkdir -p /etc/sudoers.d && echo 'Defaults env_keep += "SSH_AUTH_SOCK"' > /etc/sudoers.d/ssh_auth_sock
 
-# vscode user is created in the MS devcontainer image
+# Switch to the vscode user provided by the base image
 USER vscode
 
-# copy dclab script that is used to run the local containerlab build
-# after `make build` is executed
+# Copy dclab script used to run the local containerlab build after `make build`
 COPY ./.devcontainer/dclab /usr/local/bin/dclab
 
-# create ssh key for vscode user to enable passwordless ssh to devices
+# Create SSH key for vscode user to enable passwordless SSH to devices
 RUN ssh-keygen -t ecdsa -b 256 -N "" -f ~/.ssh/id_ecdsa
 
-# install pyenv
+# Install pyenv
 RUN bash -c "$(curl https://pyenv.run)"
 
-# add empty docker config files to avoid clab warnings for vscode user
+# Add empty docker config files to avoid clab warnings for vscode user
 RUN mkdir -p /home/vscode/.docker && echo "{}" > /home/vscode/.docker/config.json
 
-# setup zsh
+# Setup Zsh and plugins
 COPY ./.devcontainer/zsh/.zshrc /home/vscode/.zshrc
 COPY ./.devcontainer/zsh/.p10k.zsh /home/vscode/.p10k.zsh
 COPY ./.devcontainer/zsh/install-zsh-plugins.sh /tmp/install-zsh-plugins.sh
 RUN bash -c "/tmp/install-zsh-plugins.sh"
 
-# setup pyenv venv for clab tests
+# Setup pyenv virtual environment for clab tests
 COPY ./tests/requirements.txt /tmp/requirements.txt
-ENV PYENV_ROOT /home/vscode/.pyenv
-ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
-RUN pyenv virtualenv system clab-rf && pyenv global clab-rf && pip install -r /tmp/requirements.txt
+ENV PYENV_ROOT="/home/vscode/.pyenv"
+ENV PATH="$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH"
+RUN pyenv virtualenv system clab-rf \
+    && pyenv global clab-rf \
+    && pip install -r /tmp/requirements.txt
\ No newline at end of file