diff --git a/.github/workflows/generate-images-drawio.yml b/.github/workflows/generate-images-drawio.yml
index c58449a3..a7740a6a 100644
--- a/.github/workflows/generate-images-drawio.yml
+++ b/.github/workflows/generate-images-drawio.yml
@@ -51,6 +51,16 @@ jobs:
             find "${{ env.DRAWIO_SRC }}" -name "*.$ext" -exec rm -v "{}" \;  
           done
 
+  lint:
+    runs-on: ubuntu-latest
+    needs: generate
+    uses: ./.github/workflows/lint.yml
+
+  commit:
+    runs-on: ubuntu-latest
+    needs: lint
+
+    steps:
       - name: Add & Commit
         uses: EndBug/add-and-commit@v9
         with:
diff --git a/.github/workflows/generate-images-plantuml.yml b/.github/workflows/generate-images-plantuml.yml
index 4a04c083..79987c44 100644
--- a/.github/workflows/generate-images-plantuml.yml
+++ b/.github/workflows/generate-images-plantuml.yml
@@ -53,6 +53,15 @@ jobs:
             rsync -v --recursive --include="*.$ext" --filter="-! */" "${{ env.PLANTUML_SRC }}"/* "${{ env.PLANTUML_OUT }}"
           done
 
+  lint:
+    needs: generate
+    uses: ./.github/workflows/lint.yml
+
+  commit:
+    needs: lint
+    runs-on: ubuntu-latest
+
+    steps:
       - name: Add & Commit
         uses: EndBug/add-and-commit@v9
         with:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2df1daee..07efe4de 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
     - main
+  workflow_call:
   workflow_dispatch:
 
 jobs:
@@ -14,6 +15,7 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
+        if: ${{ github.event_name != 'workflow_call' }}
 
       - name: Verify image references
         run: |