diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25ca1bfea1..eb1440b8b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -273,18 +273,11 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: ${{ needs.checks.outputs.go_version }}
-      - name: Publish Release Notes on new tag
-        uses: release-drafter/release-drafter@v5
-        with:
-            publish: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
       - name: Build binaries
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: ${{ !startsWith(github.ref, 'refs/tags/') && 'build --snapshot' || 'release' }} ${{ github.event_name == 'pull_request' && '--single-target' || '' }} --rm-dist ${{ !startsWith(github.ref, 'refs/tags/') && '--id kubernetes-ingress' || '' }}
+          args: build --rm-dist --id kubernetes-ingress ${{ github.event_name == 'pull_request' && '--single-target' || '' }} ${{ !startsWith(github.ref, 'refs/tags/') && '--snapshot' || '' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GOPATH: ${{ needs.check.outputs.go_path }}
@@ -471,3 +464,16 @@ jobs:
           git -c user.name='${{ env.GIT_NAME }}' -c user.email='${{ env.GIT_MAIL }}' \
           commit -m "NGINX Ingress Controller - Release ${{ needs.package-helm.outputs.type }} ${{ needs.package-helm.outputs.version }}"
           git push -u origin master
+
+  publish-release-notes:
+    name: Publish Release Notes
+    runs-on: ubuntu-20.04
+    needs: release-helm
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    steps:
+      - name: Publish Release Notes
+        uses: release-drafter/release-drafter@v5
+        with:
+            publish: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 3122f3aa94..38bb2d4cd8 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -38,13 +38,6 @@ builds:
     tags:
       - aws
 archives:
-  - id: kubernetes-ingress
-    format: binary
-    builds: [kubernetes-ingress]
-  - id: aws
-    format: binary
-    builds: [aws]
+- format: binary
 changelog:
   skip: true
-release:
-  ids: [kubernetes-ingress]