diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 6d314b86..093aa29b 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -75,7 +75,7 @@ jobs:
           repo: RetroDECK-cooker
         continue-on-error: true
 
-      # In case it cannot publish the release at least it's probiding the flatpak file for creating a manual release
+      # 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
         with:
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
new file mode 100644
index 00000000..7821f03e
--- /dev/null
+++ b/.github/workflows/main-selfhosted.yml
@@ -0,0 +1,82 @@
+name: main-selfhosted
+
+on:
+  push:
+    branches:
+     - main
+  pull_request: 
+    branches:
+     - main
+
+  workflow_dispatch:
+
+
+jobs:
+
+  Building_flatpak:
+    runs-on: self-hosted
+    steps:
+
+      - name: Get date for artifacts
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')"
+
+      - name: Extract branch name
+        shell: bash
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        id: extract_branch
+
+      - name: Generate build ID
+        id: generating_buildid
+        run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")"
+      
+      - uses: actions/checkout@v3
+
+      - name: Initialize enviornment
+        run: |
+          git pull
+          git submodule init
+          git submodule update
+          sudo apt install -y flatpak flatpak-builder p7zip-full
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
+
+      # for main remember to change ${HOME} into ${GITHUB_WORKSPACE}
+      - name: Build flatpak
+        run: |
+          flatpak-builder --build-only --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
+
+      - name: Create Bundle
+        run: |
+          flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
+          flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
+
+      - name: Read version from version file
+        id: version
+        run: echo "##[set-output name=version;]$(cat $(find . -name version))"
+
+      - name: Publish the flatpak in a new release
+        uses: ncipollo/release-action@v1
+        with:
+          #tag: "${{ steps.version.outputs.version }}"
+          tag: "${{ steps.generating_buildid.outputs.build-id }}"
+          body: |
+            # Release Notes
+
+            ( Write release notes here )
+
+          artifacts: "RetroDECK.flatpak"
+          allowUpdates: true
+          prerelease: true
+          draft: true
+          token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+          repo: RetroDECK
+        continue-on-error: true
+
+      # 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
+        with:
+          name: retrodeck-flatpak
+          path: RetroDECK.flatpak
+        continue-on-error: true
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1b8a8bdc..f3270489 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,12 +5,12 @@ name: main
 # Controls when the workflow will run
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
-  push:
-    branches: 
-      - main
-  pull_request:
-    branches:
-      - main
+  # push:
+  #   branches: 
+  #     - main
+  # pull_request:
+  #   branches:
+  #     - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch: