diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 06fc2aeb..5f0ba21e 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -109,22 +109,3 @@ jobs:
           org.opencontainers.image.source=${{ github.event.repository.clone_url }}
           org.opencontainers.image.created=${{ steps.prep.outputs.created }}
           org.opencontainers.image.revision=${{ github.sha }}
-
-    # - name: Comment on PR
-    #   uses: mshick/add-pr-comment@v2
-    #   if: always()
-    #   env:
-    #    GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-    #   with:
-    #     message-success: '@${{ github.actor }} Image is available for testing. `docker pull ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }}`'
-    #     message-failure: '@${{ github.actor }} Yikes! You better fix it before anyone else finds out! [Build](https://github.com/${{ github.repository }}/commit/${{ github.event.pull_request.head.sha }}/checks) has Failed!'
-    #     allow-repeats: false
-
-    # - name: Notify Slack
-    #   uses: 8398a7/action-slack@v3
-    #   if: always() # Pick up events even if the job fails or is canceled.
-    #   with:
-    #     status: ${{ job.status }}
-    #     fields: repo,author,action,eventName,ref,workflow
-    #   env:
-    #     SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 2daa6b19..7a74daf9 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -162,7 +162,7 @@ jobs:
       id: generate_operator_tag
       uses: anothrNick/github-tag-action@1.61.0
       env:
-        GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         WITH_V: false
         DEFAULT_BUMP: patch
         DRY_RUN: true
@@ -220,7 +220,7 @@ jobs:
         branch: master
         repository: stakater-charts
         target_dir: docs
-        token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        token: ${{ secrets.GHCR_TOKEN }}
         charts_dir: charts/
         charts_url: ${{ env.HELM_REGISTRY_URL }}
         owner: stakater
@@ -240,13 +240,13 @@ jobs:
     - name: Push changes
       uses: ad-m/github-push-action@master
       with:
-        github_token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        github_token: ${{ secrets.PUBLISH_TOKEN }}
 
     # Push Latest Tag
     - name: Push Latest Tag
       uses: anothrNick/github-tag-action@1.61.0
       env:
-        GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         WITH_V: true
         DEFAULT_BUMP: patch