diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 07982fcb..ff0c2bbd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,6 +53,6 @@ jobs:
         name: Build and push
         run: |
           set -ex
-          make push manifest "PROGRESS=plain" "BUILDER=${{ steps.buildx.outputs.name }}" "TARGET=${{ inputs.image }}-ci" "TAGS=${{ inputs.tags }}" "CONTEXTS=${{ inputs.contexts }}"
+          make push manifest "PROGRESS=plain" "BUILDER=${{ steps.buildx.outputs.name }}" "TARGET=${{ inputs.image }}-ci" "REPOSITORY=${{ inputs.repository }}" "TAGS=${{ inputs.tags }}" "CONTEXTS=${{ inputs.contexts }}"
           echo "digest=-Pisle.${{ inputs.image }}.digest=${{ inputs.repository }}/${{ inputs.image }}@sha256:$(cat build/${{ inputs.image }}.digest)" >> $GITHUB_OUTPUT
           echo "context=docker-image://${{ inputs.repository }}/${{ inputs.image }}@sha256:$(cat build/${{ inputs.image }}.digest)" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/description.yml b/.github/workflows/description.yml
index 101d1d59..7831bc73 100644
--- a/.github/workflows/description.yml
+++ b/.github/workflows/description.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/activemq
+          repository: ${{ vars.repository }}/activemq
           readme-filepath: ./activemq/README.md
 
       - name: Alpaca - Update Docker Hub Description
@@ -31,7 +31,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/alpaca
+          repository: ${{ vars.repository }}/alpaca
           readme-filepath: ./alpaca/README.md
 
       - name: Base - Update Docker Hub Description
@@ -39,7 +39,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/base
+          repository: ${{ vars.repository }}/base
           readme-filepath: ./base/README.md
 
       - name: Blazegraph - Update Docker Hub Description
@@ -47,7 +47,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/blazegraph
+          repository: ${{ vars.repository }}/blazegraph
           readme-filepath: ./blazegraph/README.md
 
       - name: cantaloupe - Update Docker Hub Description
@@ -55,7 +55,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/cantaloupe
+          repository: ${{ vars.repository }}/cantaloupe
           readme-filepath: ./cantaloupe/README.dockerhub.md
 
       - name: Code-Server - Update Docker Hub Description
@@ -63,7 +63,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/code-server
+          repository: ${{ vars.repository }}/code-server
           readme-filepath: ./code-server/README.md
 
       - name: Crayfish - Update Docker Hub Description
@@ -71,7 +71,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/crayfish
+          repository: ${{ vars.repository }}/crayfish
           readme-filepath: ./crayfish/README.md
 
       - name: CrayFits - Update Docker Hub Description
@@ -79,7 +79,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/crayfits
+          repository: ${{ vars.repository }}/crayfits
           readme-filepath: ./crayfits/README.md
 
       - name: Drupal - Update Docker Hub Description
@@ -87,7 +87,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/drupal
+          repository: ${{ vars.repository }}/drupal
           readme-filepath: ./drupal/README.md
 
       - name: Fcrepo6 - Update Docker Hub Description
@@ -95,7 +95,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/fcrepo6
+          repository: ${{ vars.repository }}/fcrepo6
           readme-filepath: ./fcrepo6/README.md
 
       - name: Fits - Update Docker Hub Description
@@ -103,7 +103,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/fits
+          repository: ${{ vars.repository }}/fits
           readme-filepath: ./fits/README.md
 
       - name: Handle - Update Docker Hub Description
@@ -111,7 +111,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/handle
+          repository: ${{ vars.repository }}/handle
           readme-filepath: ./handle/README.md
 
       - name: Homarus - Update Docker Hub Description
@@ -119,7 +119,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/homarus
+          repository: ${{ vars.repository }}/homarus
           readme-filepath: ./homarus/README.md
 
       - name: Houdini - Update Docker Hub Description
@@ -127,7 +127,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/houdini
+          repository: ${{ vars.repository }}/houdini
           readme-filepath: ./houdini/README.md
 
       - name: hypercube - Update Docker Hub Description
@@ -135,7 +135,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/hypercube
+          repository: ${{ vars.repository }}/hypercube
           readme-filepath: ./hypercube/README.md
 
       - name: Java - Update Docker Hub Description
@@ -143,7 +143,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/java
+          repository: ${{ vars.repository }}/java
           readme-filepath: ./java/README.md
 
       - name: MariaDB - Update Docker Hub Description
@@ -151,7 +151,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/mariadb
+          repository: ${{ vars.repository }}/mariadb
           readme-filepath: ./mariadb/README.md
 
       - name: Matomo - Update Docker Hub Description
@@ -159,7 +159,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/matomo
+          repository: ${{ vars.repository }}/matomo
           readme-filepath: ./matomo/README.md
 
       - name: Milliner - Update Docker Hub Description
@@ -167,7 +167,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/milliner
+          repository: ${{ vars.repository }}/milliner
           readme-filepath: ./milliner/README.md
 
       - name: Nginx - Update Docker Hub Description
@@ -175,7 +175,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/nginx
+          repository: ${{ vars.repository }}/nginx
           readme-filepath: ./nginx/README.md
 
       - name: PostgreSQL - Update Docker Hub Description
@@ -183,7 +183,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/postgresql
+          repository: ${{ vars.repository }}/postgresql
           readme-filepath: ./postgresql/README.md
 
       - name: RipRap - Update Docker Hub Description
@@ -191,7 +191,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/riprap
+          repository: ${{ vars.repository }}/riprap
           readme-filepath: ./riprap/README.md
 
       - name: Solr - Update Docker Hub Description
@@ -199,7 +199,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/solr
+          repository: ${{ vars.repository }}/solr
           readme-filepath: ./solr/README.md
 
       - name: Test - Update Docker Hub Description
@@ -207,7 +207,7 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/tomcat
+          repository: ${{ vars.repository }}/tomcat
           readme-filepath: ./test/README.md
 
       - name: Tomcat - Update Docker Hub Description
@@ -215,5 +215,5 @@ jobs:
         with:
           username: ${{ secrets.registry_user }}
           password: ${{ secrets.registry_password }}
-          repository: islandora/tomcat
+          repository: ${{ vars.repository }}/tomcat
           readme-filepath: ./tomcat/README.md