diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 76b19b88a0..faa6d6e78d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -484,7 +484,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with: { fetch-depth: 2 }
-      - run: echo # nothing specific to install or do
+      - run: sudo apt -y update && sudo apt -y install yq
       - run: cd test/cube && make
 
   zephyr_examples:
diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml
index 83a378e7d9..34baf80b19 100644
--- a/.github/workflows/quicktest.yml
+++ b/.github/workflows/quicktest.yml
@@ -337,7 +337,7 @@ jobs:
       - run: |
           if ./test/match_changed_files.sh '^src|examples/stm32/nucleo-*-cube-*'; then
             echo GO=1 >> $GITHUB_ENV
-            # nothing specific to install or do
+            sudo apt -y update && sudo apt -y install yq
           fi
       - if: ${{ env.GO == 1 }}
         run: cd test/cube && make
diff --git a/test/cube/Makefile b/test/cube/Makefile
index d464e04519..85d510a7a6 100644
--- a/test/cube/Makefile
+++ b/test/cube/Makefile
@@ -2,15 +2,14 @@ ROOT ?= $(realpath $(CURDIR)/../..)
 PROJECTS ?= $(wildcard ../../examples/stm32/nucleo-*-cube-*)
 TARGET ?= Debug
 DOCKER = docker run --rm -v $(ROOT):$(ROOT) -v $(CURDIR):/root -w $(CURDIR) 
-IMAGE ?= springrockconsulting/stm32cubeide:v1
-# image author did not set path, so a hardcoded reference to a variable name dir is needed
-PATHTO ?= /opt/st/stm32cubeide_1.12.0/
+IMAGE ?= scaprile/cubeozone
+# set PATHTO if image author did not set path
 
 all: $(PROJECTS)
 	$(DOCKER) $(IMAGE) $(PATHTO)headless-build.sh -data workspace -removeAll workspace
 
 $(PROJECTS): FORCE
-	$(DOCKER) $(IMAGE) $(PATHTO)headless-build.sh -data workspace -import $@ -cleanBuild $(@F)/$(TARGET)
+	(make -C $@ && make -C $@ clean) || $(DOCKER) $(IMAGE) $(PATHTO)headless-build.sh -data workspace -import $@ -cleanBuild $(@F)/$(TARGET)
 
 FORCE: