diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e18133e0f..f6e52ab2d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,10 +1,12 @@
 FROM ubuntu:24.04
 
+ENV PATH="$PATH:/opt/st/stm32cubeclt_1.16.0/GNU-tools-for-STM32/bin:/opt/st/stm32cubeclt_1.16.0/CMake/bin"
+
 # Install git, git-lfs, pip and colorama, and create workspace directory
 RUN apt-get update && apt-get -y install git git-lfs python3-colorama cmake g++ build-essential && \
     git lfs install
-    
+
 # Install cubeclt
 RUN mkdir /temp && cd /temp && git clone https://github.com/HyperloopUPV-H8/cubeclt.git && \
     cd cubeclt && git lfs pull && chmod +x cubeclt_1.16.0_installer.sh && \
-    echo | LICENSE_ALREADY_ACCEPTED=1 ./cubeclt_1.16.0_installer.sh
\ No newline at end of file
+    echo | LICENSE_ALREADY_ACCEPTED=1 ./cubeclt_1.16.0_installer.sh
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 43c1e00ce..d86c0c0e8 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -13,10 +13,11 @@ jobs:
       matrix:
         build_type: [hardware,simulator]
     runs-on: ubuntu-24.04
+    container:
+      image: jmaralo/hyperloop-upv-firmware:0.2.0
     steps:
-      - uses: actions/checkout@v3
-      - uses: carlosperate/arm-none-eabi-gcc-action@v1
-      - run: arm-none-eabi-gcc --version
+      - name: Clone ST-LIB
+        uses: actions/checkout@v3
       - name: Build 
         run: ./tools/build.sh ${{matrix.build_type}}
         ## the following is because of this known limitation
@@ -32,17 +33,4 @@ jobs:
           retention-days: 1
         #this is because hardware build doesnot create the 
         # test executable
-        continue-on-error: true
-  Run-Tests:
-    name: Run Simulator tests
-    needs: build
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Download test binary compressed
-        uses: actions/download-artifact@v4
-        with:
-          name: stlib_test
-      - run: tar -xvf test_files.tar
-      - name: Run test
-        run: ./tools/run_sim_tests.sh
+        continue-on-error: true
\ No newline at end of file