diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
index 845f0bb586..ac0878abce 100644
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -34,16 +34,11 @@ jobs:
     timeout-minutes: 90
     steps:
       - name: Maximize build space
-        uses: easimon/maximize-build-space@v10
+        uses: justinthelaw/maximize-github-runner-space@v0.8.0
         with:
-          root-reserve-mb: 30720
-          temp-reserve-mb: 10240
-          swap-size-mb: 4096
-          remove-dotnet: true
-          remove-android: true
-          remove-haskell: true
-          remove-codeql: true
-          remove-docker-images: true
+          cleanup-profile: max
+          skip-components: docker-engine,gh-cli
+          swapfile-size: 4096MiB
       - name: Check branch
         run: echo "${{ github.ref_name }}" | grep -Pq '^release/v3\.\d+\.\d+$'
       - name: Get version
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 983ecbcbf4..a3eef0a32a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,7 +40,9 @@ For details about compatibility between different releases, see the **Commitment
 
 - Mutex locking that caused the rights to be fetched for authorization checks sequentially. This caused gateways to reconnect slowly after Gateway Server restarts and rpcs to timeout that were asserting gateway rights.
 
-## [3.36.0] - unreleased
+### Security
+
+## [3.36.0] - 2026-04-03
 
 ### Fixed
 
diff --git a/data/lorawan-devices b/data/lorawan-devices
index dd8c16d7e9..0db7de3162 160000
--- a/data/lorawan-devices
+++ b/data/lorawan-devices
@@ -1 +1 @@
-Subproject commit dd8c16d7e92fc30a3cc16026e419c54a99536087
+Subproject commit 0db7de31624382f34a14ab787b9799f4edd477b4
diff --git a/package.json b/package.json
index 893af7b0dc..55a294e07c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ttn-stack",
-  "version": "3.35.2",
+  "version": "3.36.0",
   "description": "The Things Stack",
   "main": "index.js",
   "repository": "https://github.com/TheThingsNetwork/lorawan-stack.git",
diff --git a/pkg/version/ttn.go b/pkg/version/ttn.go
index dac2162eb2..c930c3b173 100644
--- a/pkg/version/ttn.go
+++ b/pkg/version/ttn.go
@@ -3,4 +3,4 @@
 package version
 
 // TTN Version
-var TTN = "3.35.2-dev"
+var TTN = "3.36.0-dev"
diff --git a/sdk/js/package.json b/sdk/js/package.json
index ff49bceac2..450452cc03 100644
--- a/sdk/js/package.json
+++ b/sdk/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ttn-lw",
-  "version": "3.35.2",
+  "version": "3.36.0",
   "description": "The Things Stack for LoRaWAN JavaScript SDK",
   "url": "https://github.com/TheThingsNetwork/lorawan-stack/tree/default/sdk/js",
   "main": "dist/index.js",