diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index b996d77..b2e1db8 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  create_and_build:
+  create-and-build:
     name: Create and build
 
     strategy:
@@ -19,3 +19,20 @@ jobs:
           node-version: "20"
       - run: node bin/create-cubing-app my-cubing-project
       - run: cd my-cubing-project && npm run build
+
+  app-template-build:
+    name: Create and build app from repo
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - run: npm install
+      - run: make app-template-build
diff --git a/Makefile b/Makefile
index ada47e1..2af8e13 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,29 @@
-.PHONY: app-dev
-app-dev:
+.PHONY: app-template-dev
+app-template-dev:
 	cd app-template && npm run dev
 
 .PHONY: dev
-dev: app-dev
+dev: app-template-dev
 
-.PHONY: app-build
-app-build:
+.PHONY: app-template-build
+app-template-build: app-template/node_modules
 	cd app-template && npm run build
 
+.PHONY: app-template/node_modules
+app-template/node_modules:
+	cd app-template && npm install
+
+
 .PHONY: build
-build: app-build
+build: app-template-build
 
-.PHONY: app-clean
-app-clean:
-	cd app-template && npm run clean
+.PHONY: app-template-clean
+app-template-clean: 
+	cd app-template
 
 .PHONY: clean
-clean:
-	rm -rf ./dist && npm run app-clean
+clean: app-template-clean
+	rm -rf ./dist
 
 .PHONY: auto-publish
 auto-publish: