diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 19495a4c97..ff4cccd6e3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,9 +26,10 @@ jobs:
       - name: Build Changelog
         run: antsibull-changelog generate --output release-changelog.txt --only-latest
       - name: Deploy Ansible Collection
-        run: make publish GALAXY_API_KEY=${{ secrets.GALAXY_API_KEY }}
+        run: make publish
+        env:
+          ANSIBLE_GALAXY_TOKEN: ${{ secrets.GALAXY_API_KEY }}
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: theforeman-foreman-*.tar.gz
-          body_path: release-changelog.txt
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh release create ${{ github.ref_name }} -F release-changelog.txt theforeman-foreman-*.tar.gz
diff --git a/Makefile b/Makefile
index cca86a9fbf..e70d598119 100644
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,7 @@ $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz: $(addprefix build/src/,$(DEPENDENCIES))
 dist: $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz
 
 publish: $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz
-	ansible-galaxy collection publish --api-key $(GALAXY_API_KEY) $<
+	ansible-galaxy collection publish $<
 
 clean:
 	rm -rf build docs/plugins