diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a9b3c96..f7a622e6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
 
   verify-private:
     if: |
-      github.repository == 'qdm12/gluetun' &&
+      github.repository == 'passteque/gluetun' &&
       (
         github.event_name == 'push' ||
         github.event_name == 'release' ||
@@ -163,7 +163,7 @@ jobs:
 
   publish:
     if: |
-      github.repository == 'qdm12/gluetun' &&
+      github.repository == 'passteque/gluetun' &&
       (
         github.event_name == 'push' ||
         github.event_name == 'release' ||
@@ -175,6 +175,7 @@ jobs:
       contents: read
       packages: write
     runs-on: ubuntu-latest
+    environment: secrets
     steps:
       - uses: actions/checkout@v6
 
@@ -209,7 +210,7 @@ jobs:
         with:
           registry: ghcr.io
           username: qdm12
-          password: ${{ github.token }}
+          password: ${{ secrets.GHCR_PAT }}
 
       - name: Short commit
         id: shortcommit
diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml
index 61a6c497..39100639 100644
--- a/.github/workflows/markdown.yml
+++ b/.github/workflows/markdown.yml
@@ -38,7 +38,7 @@ jobs:
           config-file: .github/workflows/configs/mlc-config.json
 
       - uses: peter-evans/dockerhub-description@v5
-        if: github.repository == 'qdm12/gluetun' && github.event_name == 'push'
+        if: github.repository == 'passteque/gluetun' && github.event_name == 'push'
         with:
           username: qmcgaw
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
diff --git a/.github/workflows/update-servers-list.yml b/.github/workflows/update-servers-list.yml
index f5bc3dac..d6746c9e 100644
--- a/.github/workflows/update-servers-list.yml
+++ b/.github/workflows/update-servers-list.yml
@@ -36,7 +36,7 @@ on:
     - cron: "11 3 1 */2 *" # Run at 03:11 on the 1st of every 2nd month
 jobs:
   update-servers-list:
-    if: github.repository == 'qdm12/gluetun'
+    if: github.repository == 'passteque/gluetun'
     runs-on: ubuntu-latest
     permissions:
       actions: read