diff --git a/.github/workflows/build-infra-dockers.yaml b/.github/workflows/build-infra-dockers.yaml
index 9d072b089..cb7644c6d 100644
--- a/.github/workflows/build-infra-dockers.yaml
+++ b/.github/workflows/build-infra-dockers.yaml
@@ -21,7 +21,7 @@ jobs:
     name: Build and push Docker images
     if: github.repository == 'syncthing/syncthing'
     runs-on: ubuntu-latest
-    environment: docker
+    environment: release
     strategy:
       matrix:
         pkg:
diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml
index 4557e490c..d2eb9c44c 100644
--- a/.github/workflows/build-syncthing.yaml
+++ b/.github/workflows/build-syncthing.yaml
@@ -138,7 +138,7 @@ jobs:
   package-windows:
     name: Package for Windows
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
-    environment: signing
+    environment: release
     runs-on: windows-latest
     steps:
       - name: Set git to use LF
@@ -254,7 +254,7 @@ jobs:
   package-macos:
     name: Package for macOS
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
-    environment: signing
+    environment: release
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
@@ -353,7 +353,7 @@ jobs:
   notarize-macos:
     name: Notarize for macOS
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
-    environment: signing
+    environment: release
     needs:
       - package-macos
       - basics
@@ -496,7 +496,7 @@ jobs:
   sign-for-upgrade:
     name: Sign for upgrade
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-')  || startsWith(github.ref, 'refs/tags/v'))
-    environment: signing
+    environment: release
     needs:
       - basics
       - package-windows
@@ -628,7 +628,7 @@ jobs:
   publish-nightly:
     name: Publish nightly build
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && startsWith(github.ref, 'refs/heads/release-nightly')
-    environment: signing
+    environment: release
     needs:
       - sign-for-upgrade
       - notarize-macos
@@ -679,7 +679,7 @@ jobs:
   publish-release-files:
     name: Publish release files
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/tags/v'))
-    environment: signing
+    environment: release
     needs:
       - sign-for-upgrade
       - package-debian
@@ -745,7 +745,7 @@ jobs:
   publish-apt:
     name: Publish APT
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
-    environment: signing
+    environment: release
     needs:
       - basics
       - package-debian
@@ -828,7 +828,7 @@ jobs:
     name: Build and push Docker images
     runs-on: ubuntu-latest
     if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/infrastructure' || startsWith(github.ref, 'refs/heads/release-') || startsWith(github.ref, 'refs/tags/v'))
-    environment: docker
+    environment: release
     strategy:
       matrix:
         pkg: