diff --git a/.gitea/workflows/build-hyprwayland-scanner.yml b/.gitea/workflows/build-hyprwayland-scanner.yml
index 49fa0ab..27ed0ed 100644
--- a/.gitea/workflows/build-hyprwayland-scanner.yml
+++ b/.gitea/workflows/build-hyprwayland-scanner.yml
@@ -18,34 +18,25 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update
-          sudo apt-get install -y podman skopeo iptables
+          sudo apt-get install -y podman
 
       # These stage versions are pinned by https://github.com/renovatebot/renovate
       - name: Checkout
         uses: actions/checkout@v6 # v5
 
-      - name: Setup workspace
-        shell: bash
-        run: |
-          mkdir -p ./rpmbuild/{RPMS,SPECS}
-          cp ./hyprwayland-scanner/hyprwayland-scanner.spec ./rpmbuild/SPECS
-
       - name: Build RPM
-        shell: bash
-        run: |
-          podman run --rm \
-            -v ./rpmbuild:/root/rpmbuild:rw,z \
-            -v ./entrypoint.sh:/root/entrypoint.sh:ro,z \
-            -w /root \
-            fedora:latest \
-            /root/entrypoint.sh /root/rpmbuild/SPECS/hyprwayland-scanner.spec
+        uses: git.hydrosaber.com/hydros/build-rpm@main
+        with:
+          spec-file-path: ./hyprwayland-scanner/hyprwayland-scanner.spec
 
-      - name: List everything
+      - name: Upload package
         shell: bash
+        env:
+          RPM_PACKAGE_TOKEN: ${{ secrets.RPM_PACKAGE_TOKEN }}
+          PACKAGE_GROUP: f43
         run: |
-          echo "Home directory"
-          ls ~
-          echo "Current directory"
-          ls .
-          echo "Supposed rpm location"
-          ls ./rpmbuild/RPMS/x86_64
+          find ./rpmbuild/RPMS/ -name "*.rpm" -type f \
+            -exec curl \
+            --user eriq12:${RPM_PACKAGE_TOKEN} \
+            --upload-file {} \
+            https://git.hydrosaber.com/api/packages/hydros/rpm/${PACKAGE_GROUP}/upload
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100755
index 7b971ab..0000000
--- a/entrypoint.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-dnf -y config-manager --add-repo https://git.hydrosaber.com/api/packages/hydros/rpm/f43.repo
-
-dnf -y install rpmdevtools
-rpmdev-setuptree
-
-dnf -y builddep $1
-
-rpmdev-spectool -g -C ~/rpmbuild/SOURCES $1
-rpmbuild --nodebuginfo --bb $1