diff --git a/.build.yml b/.build.yml
index 87646ae..8216e29 100644
--- a/.build.yml
+++ b/.build.yml
@@ -43,5 +43,5 @@ tasks:
   - publish: |
       cd alpine-cli
       chpst -e ~/.envdir go-task publish
-      chpst -e ~/.envdir go-task registry=docker.io registry_pass_var=DH_PAT publish
-      chpst -e ~/.envdir go-task registry=quay.io registry_pass_var=QUAY_PAT publish
+      chpst -e ~/.envdir go-task REGISTRY=docker.io REGISTRY_PASS_VAR=DH_PAT publish
+      chpst -e ~/.envdir go-task REGISTRY=quay.io REGISTRY_PASS_VAR=QUAY_PAT publish
diff --git a/Taskfile.yml b/Taskfile.yml
index f17edf4..b52e084 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -45,7 +45,7 @@ tasks:
       - podman manifest push {{.REGISTRY}}/{{.IMAGE}}:{{default .TAG .ALT_TAG}}
       - podman logout {{.REGISTRY}}
     vars:
-      REGISTRY_PASS_VAR: '{{.GH_PAT | default .DOCKERHUB_PAT}}'
-      REGISTRY: '{{.REGISTRY | default "docker.io"}}'
+      REGISTRY_PASS_VAR: '{{.REGISTRY_PASS_VAR | default "GH_PAT"}}'
+      REGISTRY: '{{.REGISTRY | default "ghcr.io"}}'
       REGISTRY_USER: '{{.REGISTRY_USER | default "jswank"}}'