diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
index e284271..aa6a97d 100644
--- a/.github/workflows/build-latest.yaml
+++ b/.github/workflows/build-latest.yaml
@@ -80,6 +80,7 @@ jobs:
           tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
           build-args: |
             DISTRO=${{ matrix.distro }}
+            IMAGE_OWNER=${{ secrets.DOCKERHUB_REPO }}
             IMAGE_VERSION=${{ matrix.imageVersion }}
             IMAGE_VARIANT=${{ matrix.imageVariant }}
             POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
@@ -131,9 +132,10 @@ jobs:
           file: Dockerfile
           push: false
           load: true
-          tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:manual-build
+          tags: kartoza/postgis:manual-build
           build-args: |
             DISTRO=${{ matrix.distro }}
+            IMAGE_OWNER=kartoza
             IMAGE_VERSION=${{ matrix.imageVersion }}
             IMAGE_VARIANT=${{ matrix.imageVariant }}
             POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
@@ -148,7 +150,7 @@ jobs:
           context: .
           file: Dockerfile.test
           push: false
-          tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:manual-build
+          tags: kartoza/postgis:manual-build
           load: true
       - name: Run scenario test
         run: |
diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
index 338e94f..3335047 100644
--- a/.github/workflows/deploy-image.yaml
+++ b/.github/workflows/deploy-image.yaml
@@ -84,6 +84,7 @@ jobs:
           tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
           build-args: |
             DISTRO=${{ matrix.distro }}
+            IMAGE_OWNER=${{ secrets.DOCKERHUB_REPO }}
             IMAGE_VERSION=${{ matrix.imageVersion }}
             IMAGE_VARIANT=${{ matrix.imageVariant }}
             POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
diff --git a/Dockerfile b/Dockerfile
index ac76399..54416ac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
 ARG DISTRO=debian
+ARG IMAGE_OWNER=kartoza
 ARG IMAGE_VERSION=bullseye
 ARG IMAGE_VARIANT=slim
-FROM kartoza/postgis:base-$DISTRO-$IMAGE_VERSION-$IMAGE_VARIANT
+FROM $IMAGE_OWNER/postgis:base-$DISTRO-$IMAGE_VERSION-$IMAGE_VARIANT
 
 MAINTAINER Tim Sutton<tim@kartoza.com>