diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 86b29c2999..00f4f372e5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -91,14 +91,16 @@ jobs:
           _ARCH_: ${{ github.event.inputs.arch }}
         run: |
           make containerized_build_rpm
+          cd _output/rpmbuild/
+          sudo tar czvf /tmp/kepler.rpm.tar.gz RPMS/
           
       - if: startsWith(github.event.ref, 'refs/tags/')
         name: Release
         uses: softprops/action-gh-release@master
         with:
             files: |
-              kepler-*.rpm.tar.gz
-              /root/rpmbuild/RPMs/
+              kepler.rpm.tar.gz
+              /tmp/kepler.rpm.tar.gz
   
   create-release-branch:
     name: Create release branch
diff --git a/Makefile b/Makefile
index d6f29633fc..137237f644 100644
--- a/Makefile
+++ b/Makefile
@@ -147,9 +147,9 @@ build_rpm:
 	rpmbuild packaging/rpm/kepler.spec --build-in-place -bb
 
 containerized_build_rpm:
-	sudo mkdir -p /root/rpmbuild
+	@mkdir -p $(base_dir)/$(OUTPUT_DIR)/rpmbuild
 	$(CTR_CMD) run --rm \
-		-v $(base_dir):/kepler:Z -w /kepler -v /root/rpmbuild:/root/rpmbuild \
+		-v $(base_dir):/kepler:Z -w /kepler -v $(base_dir)/$(OUTPUT_DIR)/rpmbuild:/root/rpmbuild \
 		-e _VERSION_=${_VERSION_} -e _RELEASE_=${_RELEASE_} -e _ARCH_=${_ARCH_} \
 		-e _TIMESTAMP_="$(shell date)" -e _COMMITTER_=${_COMMITTER_} -e  _CHANGELOG_=${_CHANGELOG_} \
 		-e GOROOT=/usr/local/go -e PATH=$(PATH):/usr/local/go/bin \