diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5f8b0fa5..ba71b4e5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -40,10 +40,15 @@ jobs:
 
           pip install .
 
+          # Extract version (2.4.15 => 2_4_15), ignore the date part
+          SCHEMA_VERSION=$(echo "${{matrix.schema}}" | cut -d'_' -f2 | cut -d'.' -f1-3 | tr '.' '_')
+
+          # Run cimgen with the valid version
           cimgen \
-            --outdir=output/${{matrix.language}} \
+            --outdir=output/${{matrix.language}}/${{matrix.schema}} \
             --schemadir=cgmes_schema/${{matrix.schema}} \
-            --langdir=${{matrix.language}}
+            --langdir=${{matrix.language}} \
+            --cgmes_version=cgmes_v${SCHEMA_VERSION}
 
       - name: Create artifact
         uses: actions/upload-artifact@v4