diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml
index 76f1b9d07..f5498db03 100644
--- a/.github/workflows/arch.yml
+++ b/.github/workflows/arch.yml
@@ -56,7 +56,7 @@ jobs:
 
     - name: Sign packages
       env:
-        GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
+        GPG_KEY: ${{ secrets.LINUX_SURFACE_GPG_KEY }}
       run: |
         cd release
 
@@ -87,7 +87,7 @@ jobs:
     - name: Upload assets
       uses: svenstaro/upload-release-action@v2
       with:
-        repo_token: ${{ secrets.GITHUB_BOT_TOKEN }}
+        repo_token: ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
         file: ./*-latest/*
         tag: ${{ github.ref }}
         overwrite: true
@@ -112,7 +112,7 @@ jobs:
 
     - name: Update repository
       env:
-        SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
+        SURFACEBOT_TOKEN: ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
         BRANCH_STAGING: u/staging
         GIT_REF: ${{ github.ref }}
       run: |
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
index 8a6b1f58f..2c1a8a6e5 100644
--- a/.github/workflows/debian.yml
+++ b/.github/workflows/debian.yml
@@ -133,7 +133,7 @@ jobs:
 
     - name: Sign packages
       env:
-        GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
+        GPG_KEY: ${{ secrets.LINUX_SURFACE_GPG_KEY }}
       run: |
         # import GPG key
         echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
@@ -162,7 +162,7 @@ jobs:
     - name: Upload assets
       uses: svenstaro/upload-release-action@v2
       with:
-        repo_token: ${{ secrets.GITHUB_BOT_TOKEN }}
+        repo_token: ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
         file: ./*-latest/*
         tag: ${{ github.ref }}
         overwrite: true
@@ -187,7 +187,7 @@ jobs:
 
     - name: Update repository
       env:
-        SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
+        SURFACEBOT_TOKEN: ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
         BRANCH_STAGING: u/staging
         GIT_REF: ${{ github.ref }}
       run: |
diff --git a/.github/workflows/fedora-37.yml b/.github/workflows/fedora-37.yml
index 889d3dba4..f1926b42d 100644
--- a/.github/workflows/fedora-37.yml
+++ b/.github/workflows/fedora-37.yml
@@ -44,7 +44,7 @@ jobs:
 
     - name: Sign packages
       env:
-        GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
+        GPG_KEY: ${{ secrets.LINUX_SURFACE_GPG_KEY }}
       run: |
         cd pkg/fedora/kernel-surface/out/x86_64
 
@@ -74,7 +74,7 @@ jobs:
     - name: Upload assets
       uses: svenstaro/upload-release-action@v2
       with:
-        repo_token: ${{ secrets.GITHUB_BOT_TOKEN }}
+        repo_token: ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
         file: ./*-latest/*
         tag: ${{ github.ref }}
         overwrite: true
@@ -100,7 +100,7 @@ jobs:
 
     - name: Update repository
       env:
-        SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
+        SURFACEBOT_TOKEN: ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
         BRANCH_STAGING: u/staging
         GIT_REF: ${{ github.ref }}
       run: |
diff --git a/.github/workflows/fedora-38.yml b/.github/workflows/fedora-38.yml
index dc44f8074..2413f6393 100644
--- a/.github/workflows/fedora-38.yml
+++ b/.github/workflows/fedora-38.yml
@@ -44,7 +44,7 @@ jobs:
 
     - name: Sign packages
       env:
-        GPG_KEY: ${{ secrets.SURFACE_GPG_KEY }}
+        GPG_KEY: ${{ secrets.LINUX_SURFACE_GPG_KEY }}
       run: |
         cd pkg/fedora/kernel-surface/out/x86_64
 
@@ -74,7 +74,7 @@ jobs:
     - name: Upload assets
       uses: svenstaro/upload-release-action@v2
       with:
-        repo_token: ${{ secrets.GITHUB_BOT_TOKEN }}
+        repo_token: ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
         file: ./*-latest/*
         tag: ${{ github.ref }}
         overwrite: true
@@ -100,7 +100,7 @@ jobs:
 
     - name: Update repository
       env:
-        SURFACEBOT_TOKEN: ${{ secrets.GITHUB_BOT_TOKEN }}
+        SURFACEBOT_TOKEN: ${{ secrets.LINUX_SURFACE_BOT_TOKEN }}
         BRANCH_STAGING: u/staging
         GIT_REF: ${{ github.ref }}
       run: |