diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml
index eb2f013..f9cef2c 100644
--- a/.gitea/workflows/cd.yaml
+++ b/.gitea/workflows/cd.yaml
@@ -15,10 +15,12 @@ jobs:
           fetch-tags: true
       - name: Build tarball
         run: make tarball
+        env:
+          GIT_REFERENCE: ${{ github.ref }}
       - name: Build rpm package
         run: rpmbuild -ba "$(make name).spec"
       - name: Upload rpm package
         run: make upload
         env:
-          PACKAGES_USERNAME: ${{ vars.PACKAGES_USERNAME }}
-          PACKAGES_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
+          GIT_PACKAGES_USERNAME: ${{ vars.GIT_PACKAGES_USERNAME }}
+          GIT_PACKAGES_TOKEN: ${{ secrets.GIT_PACKAGES_TOKEN }}
diff --git a/Makefile b/Makefile
index 564170b..b179b86 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 NAME = netoik-rp
 VERSION = $(shell git describe --always --tags --abbrev=0)
 RELEASE = $(shell git rev-parse --short HEAD)
-BRANCH = $(shell git branch --show-current)
+REFERENCE = $(if $(GIT_REFERENCE),$(GIT_REFERENCE),$(shell git branch --show-current))
 BUILD_ARCH = noarch
 
 RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}')
@@ -41,11 +41,11 @@ $(RPM_TARBALL_PATH): *
 	            --output="$@" \
 	            --prefix="$(NAME)-$(VERSION)/" \
 	            --verbose \
-	            "$(BRANCH)"
+	            "$(REFERENCE)"
 
 .PHONY: tarball
 tarball: $(RPM_TARBALL_PATH)
 
 .PHONY: upload
 upload:
-	curl --fail-with-body --upload-file "$(RPM_BUILD_PATH)" --user "$(PACKAGES_USERNAME):$(PACKAGES_TOKEN)" https://git.netoik.io/api/packages/samuel/rpm/upload
+	curl --fail-with-body --upload-file "$(RPM_BUILD_PATH)" --user "$(GIT_PACKAGES_USERNAME):$(GIT_PACKAGES_TOKEN)" https://git.netoik.io/api/packages/samuel/rpm/upload