diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5ecd523..ebf5f61 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,21 +16,6 @@ on:
           Image to build, e.g. ghcr.io/organization/image.
         required: true
         type: string
-      registry:
-        description: >-
-          Registry that hosts these images; by default, ghcr.io.
-        default: ghcr.io
-        type: string
-      registry_username:
-        description: >-
-          Username for logging in to registry. For GHCR (and by default), set to github.actor.
-        default: ${{ github.actor }}
-        type: string
-      registry_token:
-        description: >-
-          Token for logging in to registry.  For GHCR (and by default), set to github.token.
-        default: ${{ github.token }}
-        type: string
       build-args:
         description: >-
           Set build time variables for the ARG instruction
@@ -105,9 +90,9 @@ jobs:
       - name: Log into container registry
         uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
-          registry: ${{ inputs.registry }}
-          username: ${{ inputs.registry_username }}
-          password: ${{ inputs.registry_token }}
+          registry: "ghcr.io"
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check if revision exists in container registry
         id: image_check
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fd1baa0..b6eaac8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -28,7 +28,7 @@ on:
         description: The github repo of the tanka control repository
         required: true
         type: string
-      # secrets:
+    secrets:
       CONFIG_REPO_RW_KEY:
         description: The private key used to talk to the GithubAPP with the App ID
         required: true
@@ -65,7 +65,7 @@ jobs:
         uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
         with:
           app-id: ${{ env.CONFIG_REPO_RW_APP_ID }}
-          private-key: ${{ inputs.CONFIG_REPO_RW_KEY }}
+          private-key: ${{ secrets.CONFIG_REPO_RW_KEY }}
           owner: ${{ github.repository_owner }}
       - name: Send the message
         uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v4.0.1
diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml
index 0273999..81213d2 100644
--- a/.github/workflows/tag-release.yml
+++ b/.github/workflows/tag-release.yml
@@ -4,21 +4,6 @@ name: "Docker Tag Release"
 on:
   workflow_call:
     inputs:
-      registry_username:
-        description: >-
-          Username for logging in to registry. Normally, set to github.actor.
-        default: ${{ github.actor }}
-        type: string
-      registry_token:
-        description: >-
-          Token for logging in to registry. Normally, use secrets.GITHUB_TOKEN.
-        required: true
-        type: string
-      registry:
-        description: >-
-          Registry that hosts these images; by default, ghcr.io.
-        default: ghcr.io
-        type: string
       existing_tag:
         description: >-
           Existing image and tag to use.
@@ -50,9 +35,9 @@ jobs:
         uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
 
         with:
-          registry: ${{ inputs.registry }}
-          username: ${{ inputs.registry_username }}
-          password: ${{ inputs.registry_token }}
+          registry: "ghcr.io"
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Wait for revision to exist in container registry
         env:
diff --git a/build/action.yml b/build/action.yml
index 7f61a81..3f69914 100644
--- a/build/action.yml
+++ b/build/action.yml
@@ -23,7 +23,7 @@ inputs:
   registry_token:
     description: >-
       Token for logging in to registry.  For GHCR (and by default), set to github.token.
-    default: ${{ github.token }}
+    default: ${{ secrets.GITHUB_TOKEN }}
   build-args:
     description: >-
       Set build time variables for the ARG instruction