diff --git a/lib/functions/artifacts/artifact-rootfs.sh b/lib/functions/artifacts/artifact-rootfs.sh
index c03b33d95..fb5510e19 100644
--- a/lib/functions/artifacts/artifact-rootfs.sh
+++ b/lib/functions/artifacts/artifact-rootfs.sh
@@ -116,7 +116,7 @@ function artifact_rootfs_cli_adapter_config_prep() {
 }
 
 function artifact_rootfs_get_default_oci_target() {
-	artifact_oci_target_base="ghcr.io/rpardini/armbian-release/"
+	artifact_oci_target_base="ghcr.io/armbian/rootfs-cache/"
 }
 
 function artifact_rootfs_is_available_in_local_cache() {
diff --git a/lib/functions/host/docker.sh b/lib/functions/host/docker.sh
index e74e601f3..e05a7f0a6 100755
--- a/lib/functions/host/docker.sh
+++ b/lib/functions/host/docker.sh
@@ -126,7 +126,7 @@ function docker_cli_prepare() {
 	# If we're NOT building the public, official image, then USE the public, official image as base.
 	# IMPORTANT: This has to match the naming scheme for tag the is used in the GitHub actions workflow.
 	if [[ "${DOCKERFILE_USE_ARMBIAN_IMAGE_AS_BASE}" != "no" && "${DOCKER_SIMULATE_CLEAN}" != "yes" ]]; then
-		DOCKER_ARMBIAN_BASE_IMAGE="ghcr.io/armbian/cache:armbian-${wanted_os_tag}-${wanted_release_tag}-latest"
+		DOCKER_ARMBIAN_BASE_IMAGE="ghcr.io/armbian/docker-armbian-build:armbian-${wanted_os_tag}-${wanted_release_tag}-latest"
 		display_alert "Using prebuilt Armbian image as base for '${wanted_os_tag}-${wanted_release_tag}'" "DOCKER_ARMBIAN_BASE_IMAGE: ${DOCKER_ARMBIAN_BASE_IMAGE}" "info"
 	fi