diff --git a/build-base/build.sh b/build-base/build.sh
index 0a9490b..0b6c783 100755
--- a/build-base/build.sh
+++ b/build-base/build.sh
@@ -10,6 +10,6 @@ ARCH=$(uname -m)
 
 # Build multi-platform image and push it
 docker build \
-  -t "gitea.jde.nz/public/dropshell-build-base:test" \
+  -t "dropshell-build-base:test" \
   -f "${SCRIPT_DIR}/Dockerfile.dropshell-build-base" \
   ${SCRIPT_DIR}
diff --git a/build-base/publish.sh b/build-base/publish.sh
index e686b2e..6ef8016 100755
--- a/build-base/publish.sh
+++ b/build-base/publish.sh
@@ -10,7 +10,7 @@ ARCH=$(uname -m)
 
 echo "Publishing dropshell-build-base:test as :latest-${ARCH}..."
 
-docker tag gitea.jde.nz/public/dropshell-build-base:test gitea.jde.nz/public/dropshell-build-base:latest-${ARCH}
+docker tag dropshell-build-base:test gitea.jde.nz/public/dropshell-build-base:latest-${ARCH}
 docker push gitea.jde.nz/public/dropshell-build-base:latest-${ARCH}
 
 echo "Successfully pushed dropshell-build-base:latest-${ARCH}"
diff --git a/tests/Dockerfile.test-build b/tests/Dockerfile.test-build
index b422aa9..4cdee6f 100644
--- a/tests/Dockerfile.test-build
+++ b/tests/Dockerfile.test-build
@@ -1,5 +1,5 @@
 ARG IMAGE_TAG
-FROM gitea.jde.nz/public/dropshell-build-base:test AS builder
+FROM dropshell-build-base:test AS builder
 
 ARG PROJECT
 ARG CMAKE_BUILD_TYPE=Debug
diff --git a/tests/build.sh b/tests/build.sh
index 37ba4a1..f006fc7 100755
--- a/tests/build.sh
+++ b/tests/build.sh
@@ -11,13 +11,9 @@ output_dir="${SCRIPT_DIR}/output"
 # Function to build a project
 build_project() {
     local project="$1"
-    local build_cmd=(docker build)
-
     
-    local tag="${project}-build"
-    
-    "${build_cmd[@]}" \
-        -t "${tag}" \
+    docker build \
+        -t "${project}-build" \
         -f "${SCRIPT_DIR}/Dockerfile.test-build" \
         --build-arg PROJECT="${project}" \
         --build-arg CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \