diff --git a/ci-automation/garbage_collect.sh b/ci-automation/garbage_collect.sh
index 1ee38f6215..59ff8e8d42 100644
--- a/ci-automation/garbage_collect.sh
+++ b/ci-automation/garbage_collect.sh
@@ -89,7 +89,7 @@ function garbage_collect() {
         else
             echo "## ${version} is an OS image version. ##"
             rmpat="${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-packages-*"
-            rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/binpkgs/boards/*/${os_vernum}/"
+            rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/boards/*/${os_vernum}/"
             rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/containers/${os_docker_vernum}/flatcar-images-*"
             rmpat="${rmpat} ${BUILDCACHE_PATH_PREFIX}/images/*/${os_vernum}/"
         fi
diff --git a/ci-automation/push_pkgs.sh b/ci-automation/push_pkgs.sh
index f9d764e71c..2f65c886bd 100644
--- a/ci-automation/push_pkgs.sh
+++ b/ci-automation/push_pkgs.sh
@@ -27,7 +27,7 @@
 #
 # OUTPUT:
 #
-#   1. Binary packages published to buildcache at "binpkgs/boards/[ARCH]-usr/[VERSION]/pkgs".
+#   1. Binary packages published to buildcache at "boards/[ARCH]-usr/[VERSION]/pkgs".
 #   2. "./ci-cleanup.sh" with commands to clean up temporary build resources,
 #        to be run after this step finishes / when this step is aborted.
 
@@ -41,7 +41,7 @@ function image_build__copy_to_bincache() {
     source ci-automation/ci_automation_common.sh
 
     cd /build/$arch-usr/var/lib/portage/pkgs/
-    copy_to_buildcache "binpkgs/boards/$arch-usr/$version/pkgs" *
+    copy_to_buildcache "boards/$arch-usr/$version/pkgs" *
 }
 # --
 
diff --git a/settings.env b/settings.env
index 3999fd0098..a0b0cd537d 100644
--- a/settings.env
+++ b/settings.env
@@ -5,4 +5,4 @@ SETTING_BINPKG_SERVER_PROD="https://mirror.release.flatcar-linux.net"
 
 # development servers / bin caches.
 SETTING_BINPKG_SERVER_DEV="https://bucket.release.flatcar-linux.net/flatcar-jenkins"
-SETTING_BINPKG_SERVER_DEV_CONTAINERISED="https://bincache.flatcar-linux.net/binpkgs"
+SETTING_BINPKG_SERVER_DEV_CONTAINERISED="https://bincache.flatcar-linux.net"