diff --git a/lib/functions/compilation/kernel-git-oras.sh b/lib/functions/compilation/kernel-git-oras.sh
index 2221ab77e6..744e3b5d58 100644
--- a/lib/functions/compilation/kernel-git-oras.sh
+++ b/lib/functions/compilation/kernel-git-oras.sh
@@ -126,7 +126,7 @@ function kernel_prepare_bare_repo_decide_shallow_or_full() {
 
 	display_alert "Using ${decision} Kernel bare tree for ${KERNEL_MAJOR_MINOR}" "${decision_why}" "info"
 
-	declare base_oras_ref="ghcr.io/rpardini/armbian-git-shallow" # @TODO allow changing this
+	declare base_oras_ref="ghcr.io/armbian/shallow" # @TODO allow changing this
 	declare estimated_dl_size_mib=0 benefits="" cons=""
 	case "${decision}" in
 		shallow)
diff --git a/lib/functions/host/docker.sh b/lib/functions/host/docker.sh
index 42890ef700..e74e601f3a 100755
--- a/lib/functions/host/docker.sh
+++ b/lib/functions/host/docker.sh
@@ -126,9 +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
-		# @TODO: this is rpardini's build. It's done in a different repo, so that's why the strange "armbian-release" name. It should be armbian/build:ubuntu-jammy-latest or something.
-		DOCKER_ARMBIAN_BASE_IMAGE="ghcr.io/rpardini/armbian-release:armbian-next-${wanted_os_tag}-${wanted_release_tag}-latest"
-
+		DOCKER_ARMBIAN_BASE_IMAGE="ghcr.io/armbian/cache: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