diff --git a/.github/workflows/build-infra-dockers.yaml b/.github/workflows/build-infra-dockers.yaml
index 918cd5d36..bd04f8fb8 100644
--- a/.github/workflows/build-infra-dockers.yaml
+++ b/.github/workflows/build-infra-dockers.yaml
@@ -19,7 +19,7 @@ permissions:
 jobs:
   docker-syncthing:
     name: Build and push Docker images
-    if: github.repository == 'syncthing/syncthing'
+    if: github.repository_owner == 'syncthing'
     runs-on: ubuntu-latest
     environment: docker
     strategy:
diff --git a/.github/workflows/build-nightly.yaml b/.github/workflows/build-nightly.yaml
deleted file mode 100644
index dc6c16b4c..000000000
--- a/.github/workflows/build-nightly.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Build Syncthing (Nightly)
-
-on:
-  schedule:
-    # Run nightly build at 05:00 UTC
-    - cron: '00 05 * * *'
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  packages: write
-  artifact-metadata: write
-  attestations: write
-  id-token: write
-
-jobs:
-  build-syncthing:
-    uses: ./.github/workflows/build-syncthing.yaml
-    # if we only want nightlies to run for specific users:
-    # if: contains(fromJSON('["syncthing", "calmh"]'), github.repository_owner)
-    secrets: inherit
diff --git a/.github/workflows/org-members.yaml b/.github/workflows/org-members.yaml
index ca1fd1913..071265674 100644
--- a/.github/workflows/org-members.yaml
+++ b/.github/workflows/org-members.yaml
@@ -8,8 +8,9 @@ on:
 jobs:
 
   run-recommendation:
-    runs-on: ubuntu-latest
     name: Check for a recommendation
+    if: github.repository_owner == 'syncthing'
+    runs-on: ubuntu-latest
     steps:
 
       - uses: docker://ghcr.io/calmh/github-org-members:latest
diff --git a/.github/workflows/pr-metadata.yaml b/.github/workflows/pr-metadata.yaml
index c6364e909..8f403db9e 100644
--- a/.github/workflows/pr-metadata.yaml
+++ b/.github/workflows/pr-metadata.yaml
@@ -20,6 +20,7 @@ jobs:
 
   labels:
     name: Set labels
+    if: github.repository_owner == 'syncthing'
     runs-on: ubuntu-latest
     steps:
     - uses: srvaroa/labeler@9c29ad1ef33d169f9ef33c52722faf47a566bcf3 # v1
diff --git a/.github/workflows/release-syncthing.yaml b/.github/workflows/release-syncthing.yaml
index a80beec85..040a73746 100644
--- a/.github/workflows/release-syncthing.yaml
+++ b/.github/workflows/release-syncthing.yaml
@@ -12,6 +12,7 @@ permissions:
 jobs:
   create-release-tag:
     name: Create release tag
+    if: github.repository_owner == 'syncthing'
     runs-on: ubuntu-latest
     environment: release
     steps:
diff --git a/.github/workflows/trigger-nightly.yaml b/.github/workflows/trigger-nightly.yaml
index ed43cbed6..75d623153 100644
--- a/.github/workflows/trigger-nightly.yaml
+++ b/.github/workflows/trigger-nightly.yaml
@@ -8,9 +8,9 @@ on:
 jobs:
 
   trigger-nightly:
+    name: Push to release-nightly to trigger build
     if: github.repository_owner == 'syncthing'
     runs-on: ubuntu-latest
-    name: Push to release-nightly to trigger build
     steps:
 
       - uses: actions/checkout@v5