diff --git a/.forgejo/workflows/build-grid-rs.yaml b/.forgejo/workflows/build-grid-rs.yaml
index 5812d876..a37c9a48 100644
--- a/.forgejo/workflows/build-grid-rs.yaml
+++ b/.forgejo/workflows/build-grid-rs.yaml
@@ -10,9 +10,10 @@ on:
       - 'rust/prop_grid_rs/**'
       - '.forgejo/workflows/build-grid-rs.yaml'
 
+# Hosted on Codeberg's container registry. Same setup as build.yaml.
 env:
-  REGISTRY: git.mcintire.me
-  IMAGE_NAME: graham/prop-grid-rs
+  REGISTRY: codeberg.org
+  IMAGE_NAME: gmcintire/prop-grid-rs
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -90,7 +91,7 @@ jobs:
           max_attempts=3
           while : ; do
             if echo "${{ secrets.REGISTRY_PASSWORD }}" | \
-                docker login "${{ secrets.REGISTRY_URL }}" \
+                docker login "${{ env.REGISTRY }}" \
                   -u "${{ secrets.REGISTRY_USER }}" \
                   --password-stdin; then
               exit 0
diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 6a1d2391..16583775 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -5,9 +5,13 @@ on:
     branches:
       - main
 
+# Hosted on Codeberg's container registry. The shared
+# REGISTRY_USER / REGISTRY_PASSWORD secrets carry the Codeberg
+# token; URL is hardcoded so a wrong/missing secrets.REGISTRY_URL
+# can't push to the wrong registry.
 env:
-  REGISTRY: git.mcintire.me
-  IMAGE_NAME: graham/prop
+  REGISTRY: codeberg.org
+  IMAGE_NAME: gmcintire/prop
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -89,7 +93,7 @@ jobs:
           max_attempts=3
           while : ; do
             if echo "${{ secrets.REGISTRY_PASSWORD }}" | \
-                docker login "${{ secrets.REGISTRY_URL }}" \
+                docker login "${{ env.REGISTRY }}" \
                   -u "${{ secrets.REGISTRY_USER }}" \
                   --password-stdin; then
               exit 0