diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
deleted file mode 100644
index a2f7401..0000000
--- a/.github/workflows/release-please.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Release Please
-
-on:
-  push:
-    branches:
-      - master
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  release-please:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: googleapis/release-please-action@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 46788ab..aa94978 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,24 +1,38 @@
-name: Package and Release
+name: Release
 
 on:
   push:
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
+    branches:
+      - master
+
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
-  release:
+  release-please:
     runs-on: ubuntu-latest
+    outputs:
+      release_created: ${{ steps.release.outputs.release_created }}
+      tag_name: ${{ steps.release.outputs.tag_name }}
+    steps:
+      - uses: googleapis/release-please-action@v4
+        id: release
 
+  package:
+    needs: release-please
+    if: ${{ needs.release-please.outputs.release_created == 'true' }}
+    runs-on: ubuntu-latest
     env:
       CF_API_KEY: ${{ secrets.CF_API_KEY }}
       WOWI_API_TOKEN: ${{ secrets.WOWI_API_TOKEN }}
       WAGO_API_TOKEN: ${{ secrets.WAGO_API_TOKEN }}
       GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
-
     steps:
       - name: Clone project
         uses: actions/checkout@v4
         with:
+          ref: ${{ needs.release-please.outputs.tag_name }}
           fetch-depth: 0
 
       - name: Package and release
diff --git a/AGENTS.md b/AGENTS.md
index 62530d8..913886e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -36,8 +36,7 @@ RaidLogAuto/
 ├── .pkgmeta                     # Packaging metadata
 ├── .github/workflows/
 │   ├── lint.yml                # Luacheck CI on PRs and master
-│   ├── release.yml             # Auto-packaging on tag push
-│   └── release-please.yml     # Automated versioning and changelog
+│   └── release.yml             # Release-please + auto-packaging
 ```
 
 ### Version-Specific Files