diff --git a/.github/workflows/check-templates.yml b/.github/workflows/check-templates.yml
new file mode 100644
index 00000000..7f0c7794
--- /dev/null
+++ b/.github/workflows/check-templates.yml
@@ -0,0 +1,35 @@
+name: Check templates
+permissions: {}
+
+on: [ push, pull_request ]
+
+jobs:
+  docker-templates:	
+    permissions:
+      contents: read
+    runs-on: ubuntu-24.04
+    timeout-minutes: 30
+
+    steps:
+      # Checkout the repo
+      - name: "Checkout"
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+      # End Checkout the repo
+
+      - name: Set up environment
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y make python3 python3-pip
+          sudo pip install jinja2
+
+      - name: Run make to rebuild templates
+        working-directory: docker
+        run: make 
+
+      - name: Check for unstaged changes
+        working-directory: docker
+        run: git diff --exit-code
+        continue-on-error: false