diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
index aeb5f3594c..ba4194954b 100644
--- a/.github/workflows/build-release.yaml
+++ b/.github/workflows/build-release.yaml
@@ -11,21 +11,10 @@ jobs:
       - uses: actions/checkout@v1
       - name: build moddable headless tools
         run: |
-          # ISSUE: move this to a makefile stanza?
           export MODDABLE=$PWD
           export XS_DIR=$MODDABLE/xs
           cd $MODDABLE/build/makefiles/lin
-          # debug
-          # ISSUE: why are debug tools needed?
-          make -f $XS_DIR/makefiles/lin/xsc.mk
-          make -f $XS_DIR/makefiles/lin/xsid.mk
-          make -f $XS_DIR/makefiles/lin/xsl.mk
-          make -f tools.mk
-          # release
-          make GOAL=release -f $XS_DIR/makefiles/lin/xsc.mk
-          make GOAL=release -f $XS_DIR/makefiles/lin/xsid.mk
-          make GOAL=release -f $XS_DIR/makefiles/lin/xsl.mk
-          make GOAL=release -f tools.mk
+          make headless
       - name: check that helloworld builds
         run: |
           export MODDABLE=$PWD
diff --git a/build/makefiles/lin/makefile b/build/makefiles/lin/makefile
index daae0d91d2..5a6d33d65d 100644
--- a/build/makefiles/lin/makefile
+++ b/build/makefiles/lin/makefile
@@ -42,7 +42,20 @@ release:
 	make GOAL=release -f simulator.mk
 	make GOAL=release -f tools.mk
 	$(MODDABLE)/build/bin/lin/release/mcconfig -m -p x-lin $(MODDABLE)/tools/xsbug/manifest.json
-	
+
+# ISSUE: why do headless builds fail without debug tools?
+headless:
+	make -f $(XS_DIR)/makefiles/lin/xsc.mk
+	make -f $(XS_DIR)/makefiles/lin/xsid.mk
+	make -f $(XS_DIR)/makefiles/lin/xsl.mk
+	make -f tools.mk
+	$(MODDABLE)/build/bin/lin/debug/mcconfig -d -m -p x-lin $(MODDABLE)/tools/xsbug/manifest.json
+	make GOAL=release -f $(XS_DIR)/makefiles/lin/xsc.mk
+	make GOAL=release -f $(XS_DIR)/makefiles/lin/xsid.mk
+	make GOAL=release -f $(XS_DIR)/makefiles/lin/xsl.mk
+	make GOAL=release -f tools.mk
+	$(MODDABLE)/build/bin/lin/release/mcconfig -m -p x-lin $(MODDABLE)/tools/xsbug/manifest.json
+
 clean:
 	make clean -f $(XS_DIR)/makefiles/lin/xsc.mk
 	make clean -f $(XS_DIR)/makefiles/lin/xsid.mk