Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/build_and_docs_to_dev.yml
#	.github/workflows/manual_docs.yml
#	.github/workflows/release.yml
#	platformio.ini

.gitea/workflows/build-release.yml

@@ -67,16 +67,13 @@ jobs:
           echo "tag_name=${TAG_NAME}" >> "$GITHUB_OUTPUT"
           echo "short_sha=${SHORT_SHA}" >> "$GITHUB_OUTPUT"
 
-      - name: Set version tag in sources
-        env:
-          TAG_NAME: ${{ steps.prep.outputs.tag_name }}
-        run: |
-          sed -i "s/version_tag/${TAG_NAME}/g" main/User_config.h scripts/latest_version.json
-
       - name: Build OpenMQTTGateway Firmware (${{ steps.prep.outputs.pio_env }})
         env:
           PIO_ENV: ${{ steps.prep.outputs.pio_env }}
+          TAG_NAME: ${{ steps.prep.outputs.tag_name }}
         run: |
+          # Inject the firmware version (same mechanism as upstream scripts/ci_build_firmware.sh)
+          export PLATFORMIO_BUILD_FLAGS="-DOMG_VERSION=\\\"${TAG_NAME}\\\""
           mkdir -p ".pio/build/${PIO_ENV}"
           pio run -e "${PIO_ENV}"