diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62f973c..f35503f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,29 +4,13 @@ on:
     branches:
       - "**"
     tags:
-      - " !**"
+      - "!**"
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
      - uses: actions/checkout@v4
-     - uses: actions/setup-go@v5
-       with:
-         go-version: '1.22'
-#     - name: Install gitea provider for Go Semantic Release
-#       run: |
-#         mkdir -p .semrel/$(go env GOOS)_$(go env GOARCH)/provider-gitea/${GITEA_PROVIDER_VER}/ && \
-#         wget https://github.com/cybercinch/go-semantic-release-provider-gitea/releases/download/v${GITEA_PROVIDER_VER}/go-semantic-release-provider-gitea_v${GITEA_PROVIDER_VER}_linux_amd64 \
-#         -O .semrel/$(go env GOOS)_$(go env GOARCH)/provider-gitea/${GITEA_PROVIDER_VER}/gitea && \
-#         chmod a+x .semrel/$(go env GOOS)_$(go env GOARCH)/provider-gitea/${GITEA_PROVIDER_VER}/gitea
-#       env:
-#         GITEA_PROVIDER_VER: 1.0.11
-#     - uses: "shivammathur/setup-php@v2"
-#       with:
-#         php-version: "7.4"
-#     - uses: "ramsey/composer-install@v3"
-
      - name: Create Release Archive
        id: semrelease
        uses: go-semantic-release/action@v1
@@ -36,6 +20,4 @@ jobs:
        env:
           GITEA_TOKEN: ${{ secrets.G_TOKEN }}
           GITEA_HOST: ${{ secrets.G_SERVER_URL}}
-    env:
-      GITEA_TOKEN: ${{ secrets.G_TOKEN }}
-      GITEA_HOST: ${{ secrets.G_SERVER_URL}}
+
diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
new file mode 100644
index 0000000..c8799ac
--- /dev/null
+++ b/.github/workflows/dist.yml
@@ -0,0 +1,22 @@
+name: Create Distribution
+run-name: Distribute composer package with Gitea Actions 🚀
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  dist:
+    name: Create Archive
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4  # Checkout Sourcecode
+      - uses: https://hub.cybercinch.nz/cybercinch/composer-build-action@main
+      - uses: https://hub.cybercinch.nz/guisea/gitea-composer-upload-action@main
+        with:
+          base_url: "${{ secrets.G_SERVER_URL}}"
+          access_token: "${{ secrets.G_TOKEN }}"
+          username: "${{ secrets.G_USERNAME }}"
+          owner: "cybercinch"  # Override owner name for repository (Optional)
+          package_version: "${{ env.GITHUB_REF_NAME }}"
+
diff --git a/.semrelrc b/.semrelrc
index 2e6b6d3..5937d96 100644
--- a/.semrelrc
+++ b/.semrelrc
@@ -14,7 +14,6 @@
         "exec"
       ],
       "options": {
-        "exec_on_success": "./scripts/build.sh v{{.NewRelease.Version}}",
         "exec_on_no_release": "echo {{.Reason}}: {{.Message}}"
       }
     }
diff --git a/scripts/build.sh b/scripts/build.sh
index e8b93d9..f1e2f42 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -5,7 +5,7 @@ echo "Made temporary directory"
 
 # Package up the release (Needs to be .zip for upload to gitea)
 
-zip -r "./build/ugly-queue.zip" \
+zip -r "./build/Package.zip" \
     . \
     -x '.semrel/*' \
     -x '.generated-go-semantic-release-changelog.md' \
@@ -17,14 +17,14 @@ zip -r "./build/ugly-queue.zip" \
     -x './.github/*' \
     -x './scripts/*'
 
-RELEASE_ID=$(curl --silent -X 'GET' "${GITEA_HOST}/api/v1/repos/cybercinch/ugly-queue/releases/latest" \
--H "accept: application/json" \
--H "Authorization: token ${GITEA_TOKEN}" | jq -r .id)
-
-# Attach to release
-curl --silent -X 'POST' "${GITEA_HOST}/api/v1/repos/cybercinch/ugly-queue/releases/${RELEASE_ID}/assets?name=ugly-queue-${1}.tar.gz" \
--H "Authorization: token ${GITEA_TOKEN}" \
---form attachment="@build/ugly-queue-${1}.tar.gz"
+#RELEASE_ID=$(curl --silent -X 'GET' "${GITEA_HOST}/api/v1/repos/cybercinch/ugly-queue/releases/latest" \
+#-H "accept: application/json" \
+#-H "Authorization: token ${GITEA_TOKEN}" | jq -r .id)
+#
+## Attach to release
+#curl --silent -X 'POST' "${GITEA_HOST}/api/v1/repos/cybercinch/ugly-queue/releases/${RELEASE_ID}/assets?name=ugly-queue-${1}.tar.gz" \
+#-H "Authorization: token ${GITEA_TOKEN}" \
+#--form attachment="@build/ugly-queue-${1}.tar.gz"
 
 # Upload the artifact to composer registry
 curl --user "cibot:${GITEA_TOKEN}" \