diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d2834f53..44ded532 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -77,8 +77,8 @@ QEMU_ARCH_riscv64 = "riscv64"
 DEBDISTRONAME ?= "isar"
 
 # Isar apt repository paths
-REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/apt"
-REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/db"
+REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt"
+REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/db"
 THIRD_PARTY_APT_KEYRING = "/etc/apt/trusted.gpg.d/third_party.gpg"
 
 # Base apt repository paths