diff --git a/.github/workflows/e2e-consuming.yml b/.github/workflows/e2e-consuming.yml
index cdb9f64a9..2ba3eb16d 100644
--- a/.github/workflows/e2e-consuming.yml
+++ b/.github/workflows/e2e-consuming.yml
@@ -35,7 +35,7 @@ jobs:
           free -h
 
       - name: Build the latest Shipyard image
-        run: make dapper-image
+        run: make images
 
       - name: Checkout the ${{ matrix.project }} repository
         uses: actions/checkout@master
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c9a5ac5e3..48aff77ea 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Build new images
         env:
           IMAGES_ARGS: --nocache ${{ env.UPX_FLAG }}
-        run: make dapper-image nettest
+        run: make images nettest
 
       - name: Release the images
         env:
diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml
index 58c1aa946..b7a6cb21e 100644
--- a/.github/workflows/scripts.yml
+++ b/.github/workflows/scripts.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: Test the compile.sh script
         run: |
-          make dapper-image .dapper
+          make images .dapper
           ./.dapper -m bind test/scripts/compile/test.sh
   deploy:
     timeout-minutes: 30
diff --git a/.github/workflows/validate-consuming.yml b/.github/workflows/validate-consuming.yml
index 171a581b7..f93138067 100644
--- a/.github/workflows/validate-consuming.yml
+++ b/.github/workflows/validate-consuming.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@master
 
       - name: Build the latest Shipyard image
-        run: make dapper-image
+        run: make images
 
       - name: Checkout the ${{ matrix.project }} repository
         uses: actions/checkout@master
diff --git a/Makefile b/Makefile
index 696cd11c9..a5e56181d 100644
--- a/Makefile
+++ b/Makefile
@@ -36,11 +36,11 @@ include Makefile.images
 include Makefile.versions
 
 # Shipyard-specific starts
-clusters deploy e2e gitlint golangci-lint markdownlint nettest post-mortem unit-test validate: dapper-image
+clusters deploy e2e gitlint golangci-lint markdownlint nettest post-mortem unit-test validate: images
 
-dapper-image: export SCRIPTS_DIR=./scripts/shared
+images: export SCRIPTS_DIR=./scripts/shared
 
-dapper-image: package/.image.shipyard-dapper-base
+images: package/.image.shipyard-dapper-base
 
 .DEFAULT_GOAL := validate
 # Shipyard-specific ends
diff --git a/Makefile.dapper b/Makefile.dapper
index cfffa83b4..d71a47b15 100644
--- a/Makefile.dapper
+++ b/Makefile.dapper
@@ -12,7 +12,7 @@
 
 # Only run command line goals in dapper (except things that have to run outside of dapper).
 # Otherwise, make applies this rule to various files and tries to build them in dapper (which doesn't work, obviously).
-$(filter-out .dapper dapper-image shell,$(MAKECMDGOALS)): .dapper
+$(filter-out .dapper images shell,$(MAKECMDGOALS)): .dapper
 	+./.dapper -m bind make $@ $(MAKEFLAGS)
 
 shell: .dapper