diff --git a/.antora/antora.yml b/.antora/antora.yml
index 68c97ddf..061c88ae 100644
--- a/.antora/antora.yml
+++ b/.antora/antora.yml
@@ -7,6 +7,7 @@ version:
   main: 'current'
   master: 'current'
   v(*)-antora: V$1
+  x-antora-v(*): V$1
   v(*): V$1
   V(*): V$1
   # Update version number accordingly. This is the version for any other activated branch (branch must be added in the generator site.yml!). Schema = 0.0.x-<branch-name> (only works for branches starting with "feature/")
@@ -55,4 +56,4 @@ nav:
 # Add more items here as required.
 # Recommended: One navigation file per document/repository!
 # Recommended: Name your module (folder) as your document type, e.g. "standard" or "concept" or "topic-guidelines"
-# Format: - modules/<module-folder-name>/<navigation-file-name>.adoc
\ No newline at end of file
+# Format: - modules/<module-folder-name>/<navigation-file-name>.adoc
diff --git a/.github/workflows/antora-build.yml b/.github/workflows/antora-build.yml
index 5961f44a..49243ec9 100644
--- a/.github/workflows/antora-build.yml
+++ b/.github/workflows/antora-build.yml
@@ -24,50 +24,4 @@ jobs:
         event-type: antora-build-trigger
         repository: OpenSimulationInterface/osi-antora-generator
         client-payload: '{"src": "${{ github.repository }}", "ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "head_ref": "${{ github.head_ref }}"}'
-  # antora-build:
-  #   name: Build
-  #   runs-on: ubuntu-20.04
-
-  #   services:
-  #     kroki:
-  #       image: yuzutech/kroki:0.15.1
-  #       env:
-  #         KROKI_MAX_URI_LENGTH: 8000
-  #         KROKI_BLOCKDIAG_HOST: blockdiag
-  #         KROKI_MERMAID_HOST: mermaid
-  #     blockdiag:
-  #       image: yuzutech/kroki-blockdiag:0.15.1
-  #     mermaid:
-  #       image: yuzutech/kroki-mermaid:0.15.1
-
-  #   steps:
-  #   - name: Checkout generator
-  #     uses: actions/checkout@master
-  #     with:
-  #       repository: OpenSimulationInterface/osi-antora-generator
-  #       path: generator
-  #       submodules: true
-  #       fetch-depth: 0
-
-  #   - name: Modify site.yml
-  #     working-directory: generator
-  #     run: |
-  #       echo "$GITHUB_REF_NAME"
-  #       sed -i -E "s%(branches\:) \[antora\/base-antora-setup\] \# osi-documentation%\1 [$GITHUB_REF_NAME] \# osi-documentation%" site.yml
-  #       cat site.yml
-  #       sed -i -E "s/cd repo/cd generator/" run-build.sh
-  #       cat run-build.sh
         
-  #   - name: Generate site
-  #     uses: docker://ghcr.io/asam-ev/project-guide-docker:4
-  #     with:
-  #       entrypoint: sh
-  #       args: generator/run-build.sh
-    
-  #   - name: Upload artifact
-  #     uses: actions/upload-artifact@v3
-  #     with: 
-  #       name: antora-build
-  #       path: ./generator/site
-
-      
diff --git a/.github/workflows/remote_release.yml b/.github/workflows/remote_release.yml
new file mode 100644
index 00000000..a6e308e2
--- /dev/null
+++ b/.github/workflows/remote_release.yml
@@ -0,0 +1,30 @@
+name: Remote Tagging
+
+on:
+  repository_dispatch:
+    types: [update-tag]
+
+permissions:
+  contents: write
+  repository-projects: write
+    
+jobs:
+  submodule:
+    name: Update submodule and create tag
+    runs-on: Ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # otherwise, there would be errors pushing refs to the destination repository.
+        
+      - name: Create tag
+        run: git tag ${{ github.event.client_payload.tag }}
+        
+      - name: GitHub Push
+        uses: ad-m/github-push-action@v0.6.0
+        with:
+          # Token for the repo. Can be passed in using $\{{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.MACHINE_USER_PAT }}
+          # Determines if --tags is used
+          tags: true