diff --git a/.github/release-drafter-config.yml b/.github/release-drafter-config.yml
index dc4953957..0bea1b1ff 100644
--- a/.github/release-drafter-config.yml
+++ b/.github/release-drafter-config.yml
@@ -2,6 +2,7 @@
 name-template: 'v$RESOLVED_VERSION'
 tag-template: 'v$RESOLVED_VERSION'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+filter-by-commitish: true
 template: |
   ### What's Changed
 
diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
index 76e913b9c..2fd003baf 100644
--- a/.github/workflows/npm.yml
+++ b/.github/workflows/npm.yml
@@ -72,7 +72,7 @@ jobs:
             # Otherwise, this is a maintenance release on an older line
             # Tag as v<major>.<minor> so users can pin to it
             MAJOR_MINOR=$(echo "$VERSION" | cut -d. -f1,2)
-            DIST_TAG="v${MAJOR_MINOR}"
+            DIST_TAG="release-${MAJOR_MINOR}"
             echo "Maintenance release detected, publishing under '$DIST_TAG' tag"
             npm publish "${PUBLISH_FLAGS[@]}" --tag "$DIST_TAG"
           fi
diff --git a/README.md b/README.md
index 95d8569a7..949ff4634 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,10 @@
 
 Testing GitLabFlow branching strategy. This should automatically create a draft setting the project to `v1.1.0`.
 
+Simulating bugfix in v1.1.0. This should trigger a v1.1.1 publish from the `release-drafter.yml`. Making a new PR.
+
 Testing new feature on `v1.1.0`, from `main`. This should automatically create a draft setting the project to `v1.2.0`. Note that `v1.1.0` release has already been made, and a `v1.1.1` bugfix draft is present.
 
+Simulating bugfix in `v1.2.1`. This should create a `1.2.2` draft release.
+
 Testing new feature on `v1.2.0` from `main`. This should create a draft to `1.3.0` once the `release/1.3` branch is created. Retesting.
diff --git a/package-lock.json b/package-lock.json
index 35bacbc72..4c8d0694c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@jescalada/git-proxy-deployment-testing",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@jescalada/git-proxy-deployment-testing",
-      "version": "1.3.0",
+      "version": "1.3.1",
       "license": "Apache-2.0",
       "workspaces": [
         "./packages/git-proxy-cli"
@@ -15066,7 +15066,7 @@
     },
     "packages/git-proxy-cli": {
       "name": "@jescalada/git-proxy-cli",
-      "version": "1.3.0",
+      "version": "1.3.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@finos/git-proxy": "2.0.0-rc.6",
diff --git a/package.json b/package.json
index b6ece5701..c7914a187 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jescalada/git-proxy-deployment-testing",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Testing deployment workflows for @finos/git-proxy.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/git-proxy-cli/package.json b/packages/git-proxy-cli/package.json
index 88712acd5..2adfd3073 100644
--- a/packages/git-proxy-cli/package.json
+++ b/packages/git-proxy-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jescalada/git-proxy-cli",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Command line interface tool for FINOS GitProxy.",
   "bin": {
     "git-proxy-cli": "./dist/index.js"