diff --git a/.github/workflows/test-virgin-root.yml b/.github/workflows/test-virgin-root.yml
index dbc90b4..570eb52 100644
--- a/.github/workflows/test-virgin-root.yml
+++ b/.github/workflows/test-virgin-root.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Build virgin container (${{ matrix.distro }})
         run: |
           set -euo pipefail
-          distro="${{ matrix.distro }}" make build-missing
+          distro="${{ matrix.distro }}" make build-missing-virgin
 
       # 🔹 RUN test inside virgin image
       - name: Virgin ${{ matrix.distro }} pkgmgr test (root)
diff --git a/.github/workflows/test-virgin-user.yml b/.github/workflows/test-virgin-user.yml
index 38f965d..e7bcf4e 100644
--- a/.github/workflows/test-virgin-user.yml
+++ b/.github/workflows/test-virgin-user.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Build virgin container (${{ matrix.distro }})
         run: |
           set -euo pipefail
-          distro="${{ matrix.distro }}" make build-missing
+          distro="${{ matrix.distro }}" make build-missing-virgin
 
       # 🔹 RUN test inside virgin image as non-root
       - name: Virgin ${{ matrix.distro }} pkgmgr test (user)
diff --git a/Makefile b/Makefile
index bfb578a..deb75f8 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ install:
 setup: setup-nix setup-venv
 
 # Explicit: developer setup (Python venv + shell RC + main.py install)
-setup-venv:
+setup-venv: setup-nix
 	@bash scripts/setup/venv.sh
 
 # Explicit: Nix shell mode (no venv, no RC changes)
@@ -60,8 +60,10 @@ build:
 	@bash scripts/build/image.sh --target virgin
 	@bash scripts/build/image.sh
 
-build-missing:
+build-missing-virgin:
 	@bash scripts/build/image.sh --target virgin --missing
+
+build-missing: build-missing-virgin
 	@bash scripts/build/image.sh --missing
 
 build-no-cache: