diff --git a/.github/workflows/[TEST] cooker-selfhosted.yml b/.github/workflows/[TEST] cooker-selfhosted.yml
new file mode 100644
index 00000000..f0c4f57b
--- /dev/null
+++ b/.github/workflows/[TEST] cooker-selfhosted.yml	
@@ -0,0 +1,44 @@
+name: cooker-selfhosted
+
+on:
+  push:
+    branches:
+     - cooker*
+  pull_request: 
+    branches:
+     - cooker*
+
+  workflow_dispatch:
+
+
+jobs:
+
+  Building_RetroDECK:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Generate build ID
+        id: generating_buildid
+        run: echo "##[set-output name=build-id;]$(echo "$( git rev-parse --short HEAD )")"
+      
+      - uses: actions/checkout@v3
+
+      - name: Set environment variable with current branch name
+        run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
+
+      - name: Publish the flatpak in a new cooker release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: "${{ env.GITHUB_REF_SLUG }}-${{ steps.generating_buildid.outputs.build-id }}"
+          body: |
+            # Release Notes (Cooker)
+            This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
+      
+            Cooker channel is provided for the community to test fixes and explore new functionality.
+            Please DO NOT open issues or ask support on this build.
+
+          allowUpdates: true
+          draft: true
+          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+          repo: RetroDECK-cooker
+        continue-on-error: true
diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index d5134118..acbfe8df 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -61,13 +61,10 @@ jobs:
         run: |
           flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
 
-      - name: Set environment variable with current branch name
-        run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
-
       - name: Publish the flatpak in a new cooker release
         uses: ncipollo/release-action@v1
         with:
-          tag: "${{ env.GITHUB_REF_SLUG }}-${{ steps.generating_buildid.outputs.build-id }}"
+          tag: "${{ steps.generating_buildid.outputs.build-id }}"
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
@@ -89,4 +86,4 @@ jobs:
         with:
           name: retrodeck-flatpak
           path: RetroDECK.flatpak
-        continue-on-error: true
+        continue-on-error: true
\ No newline at end of file