diff --git a/.devcontainer/Containerfile b/.devcontainer/Containerfile
index 4c6f5eb77..ec060ef9f 100644
--- a/.devcontainer/Containerfile
+++ b/.devcontainer/Containerfile
@@ -56,9 +56,10 @@ RUN conan profile detect
 # Build image using apt dependencies
 FROM build as apt-build
 
-# Install celix dependencies
+# Install celix dependencies (note git needed for cloning gtest)
 RUN DEBIAN_FRONTEND="noninteractive" sudo apt-get update && \
     DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y --no-install-recommends \
+        git \
         civetweb \
         libavahi-compat-libdnssd-dev \
         libcivetweb-dev \
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index ea1eb4004..2099d9db5 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -38,11 +38,10 @@ jobs:
           docker build -t apache/celix-apt-build:latest --target apt-build -f .devcontainer/Containerfile
       - name: Build and test Celix the conan container image
         run: |
-          docker run --rm -v $(pwd):/workspace --userns=keep-id apache/celix-conan-build:latest /bin/bash -c \
-          "cd /workspace && \
-          cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_EXPERIMENTAL=ON -DENABLE_TESTING=ON -DRSA_JSON_RPC=ON -DRSA_SHM=ON \
+          docker run --rm -v $(pwd):/workspace --userns=keep-id apache/celix-apt-build:latest /bin/bash -c \
+          "mkdir /workspace/build && cd /workspace/build && \
+          cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_EXPERIMENTAL=ON -DENABLE_TESTING=ON -DRSA_JSON_RPC=ON  \
           -DRSA_REMOTE_SERVICE_ADMIN_SHM_V2=ON .. && \
-          cd build && \
           make -j && \
           ctest --output-on-failure"