diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index cf831cf8..8dfc36fa 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -64,6 +64,9 @@ jobs:
       # if the branch is coming from a PR the tag should be manually built
       - name: "Generate version tag"
         run: |
+          source automation_tools/version_extractor.sh
+          MANIFEST_VERSION="$(fetch_manifest_version)"
+          echo "MANIFEST_VERSION=$MANIFEST_VERSION" >> $GITHUB_ENV
           if [[ "$BRANCH_NAME" == 'refs/'* ]]; then
             pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}')
             source_branch=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/pulls/$pr_number" | jq -r '.head.ref')
@@ -71,9 +74,11 @@ jobs:
             echo "[DEBUG] source branch is: $source_branch"
             echo "TAG=PR-$pr_number-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV
           else
-            echo "TAG=${{env.BRANCH_NAME}}-${{ env.buildid }}" >> $GITHUB_ENV
+            TAG="$MANIFEST_VERSION-${{ env.buildid }}"
+            echo "TAG=$TAG" >> $GITHUB_ENV
           fi
-          echo "Version TAG: ${{ env.TAG }}"
+          echo "MANIFEST_VERSION: $MANIFEST_VERSION"
+          echo "Version TAG: $TAG"
 
       # backing up manifest in case download fails and hashes must be recalculated
       - name: Manifest backup
@@ -159,6 +164,17 @@ jobs:
           repo: RetroDECK-cooker
         continue-on-error: true
 
+      - name: Rewrite Tag
+        run: |
+          git submodule deinit -f --all
+          git fetch --tags
+          if git rev-parse --verify "${{ env.TAG }}" >/dev/null 2>&1; then # if the tag exists
+              git tag -d "${{ env.TAG }}"                                  # remove it from local repo
+              git push --delete origin "${{ env.TAG }}"                    # and from remote
+          fi
+          git tag "${{ env.TAG }}"             # Create the tag locally               
+          git push origin "${{ env.TAG }}"     # Push the new tag in the remote repo
+
       # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
       - name: Upload RetroDECK-cooker.flatpak
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
index c1932daf..a98b3360 100644
--- a/.github/workflows/main-selfhosted.yml
+++ b/.github/workflows/main-selfhosted.yml
@@ -115,6 +115,17 @@ jobs:
           repo: RetroDECK
         continue-on-error: true
 
+      - name: Rewrite Tag
+        run: |
+          git submodule deinit -f --all
+          git fetch --tags
+          if git rev-parse --verify "${{ env.REL_VER }}" >/dev/null 2>&1; then # if the tag exists
+              git tag -d "${{ env.REL_VER }}"                                  # remove it from local repo
+              git push --delete origin "${{ env.REL_VER }}"                    # and from remote
+          fi
+          git tag "${{ env.REL_VER }}"             # Create the tag locally               
+          git push origin "${{ env.REL_VER }}"     # Push the new tag in the remote repo
+
       # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
       - name: Upload RetroDECK.flatpak
         uses: actions/upload-artifact@v3
@@ -166,6 +177,7 @@ jobs:
               -H "Content-Type: multipart/form-data" \
               -F "attachment=@RetroDECK-Artifact.tar.gz" \
               "http://$UPLOAD_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases/$release_id/assets?name=RetroDECK-Artifact.tar.gz"
+        continue-on-error: true # this will be in place until we reate an artifacts website that bypasses cloudflare limit
 
       - name: Upload RetroDECK.flatpak.sha to Gitea Release
         run: |
diff --git a/automation_tools/main_version_checker.sh b/automation_tools/main_version_checker.sh
index 87011bfd..d230b205 100755
--- a/automation_tools/main_version_checker.sh
+++ b/automation_tools/main_version_checker.sh
@@ -42,8 +42,8 @@ appdata_version=$(fetch_appdata_version)
 echo -e "Appdata:\t\t$appdata_version"
 
 # Additional checks
-if [[ "$manifest_version" == "main" || "$manifest_version" == "THISBRANCH" ]]; then
-    echo "Manifest version cannot be 'main' or 'THISBRANCH'. Please fix it."
+if [[ "$manifest_version" == "main" || "$manifest_version" == "THISBRANCH" || "$manifest_version" == *"cooker"* ]]; then
+    echo "Manifest version cannot be 'main', 'THISBRANCH', or contain 'cooker'. Please fix it."
     exit 1
 fi
 
diff --git a/automation_tools/version_extractor.sh b/automation_tools/version_extractor.sh
index b9f679ff..f4714575 100755
--- a/automation_tools/version_extractor.sh
+++ b/automation_tools/version_extractor.sh
@@ -32,3 +32,5 @@ fetch_manifest_version(){
     manifest_version=$(echo "$manifest_version" | awk '{$1=$1;print}')
     echo "$manifest_version"
 }
+
+echo "Version extractor functions loaded"
\ No newline at end of file
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 4f294f40..6f9c3182 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -716,7 +716,7 @@ modules:
         # fatal: remote transport reported error
         # url: ssh://git@github.com/dolphin-emu/dolphin.git
         url: https://github.com/dolphin-emu/dolphin.git
-        commit: 505fe5cc0e3123746e673ecca77c04ec72ff106f
+        commit: cc3ff347b437fd80f3a2880d1bbc7ba2d5f191f4
         # x-checker-data:
         #   type: json
         #   url: https://dolphin-emu.org/update/latest/beta