diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
index 1b6e357ee006154b3de60318949c21c69bbbe5d8..a7ec6abc481935a69c39c0578cd4b553fae7be3a 100644
--- a/iMX8M/soc.mak
+++ b/iMX8M/soc.mak
@@ -9,7 +9,6 @@ WGET = /usr/bin/wget
 N ?= latest
 SERVER=http://yb2.am.freescale.net
 #DIR = internal-only/Linux_IMX_Rocko_MX8/$(N)/common_bsp
-#DIR = internal-only/Linux_IMX_Rocko_MX8/$(N)/common_bsp
 #DIR = internal-only/Linux_IMX_Core/$(N)/common_bsp
 DIR = internal-only/Linux_IMX_Regression/$(N)/common_bsp
 
diff --git a/iMX8QM/soc.mak b/iMX8QM/soc.mak
index d53ecaab455f878a233a768d2d05da4bc1b9315c..e4c6c591e2408b55d9b92d200b3e6613ab2da59f 100644
--- a/iMX8QM/soc.mak
+++ b/iMX8QM/soc.mak
@@ -268,8 +268,8 @@ nightly :
 	@$(WGET) -q $(SERVER)/$(DIR)/imx-boot/imx-boot-tools/imx8qm/mx8qm-val-scfw-tcm.bin -O scfw_tcm.bin
 	@$(WGET) -q $(SERVER)/$(DIR)/imx-boot/imx-boot-tools/imx8qm/bl31-imx8qm.bin -O bl31.bin
 	@$(WGET) -q $(SERVER)/$(DIR)/imx-boot/imx-boot-tools/imx8qm/u-boot-imx8qmlpddr4arm2.bin-sd -O u-boot.bin
+	@$(WGET) -q $(SERVER)/$(DIR)/imx-boot/imx-boot-tools/imx8qm/mx8qm-ahab-container.img -O mx8qm-ahab-container.img
 	@$(WGET) -qr -nd -l1 -np $(SERVER)/$(DIR) -P boot -A "Image-*imx8qm*"
-	@$(WGET) -q https://bitbucket.sw.nxp.com/projects/IMX/repos/linux-firmware-imx/raw/firmware/seco/mx8qm-ahab-container.img?at=refs%2Fheads%2Fmaster -O mx8qm-ahab-container.img
 	@$(RENAME) "Image-" "" boot/*.dtb
 
 nightly_mek :
@@ -278,7 +278,7 @@ nightly_mek :
 	@$(WGET) -q $(SERVER)/$(DIR)/imx-boot/imx-boot-tools/imx8qm/mx8qm-mek-scfw-tcm.bin -O scfw_tcm.bin
 	@$(WGET) -q $(SERVER)/$(DIR)/imx-boot/imx-boot-tools/imx8qm/bl31-imx8qm.bin -O bl31.bin
 	@$(WGET) -q $(SERVER)/$(DIR)/imx-boot/imx-boot-tools/imx8qm/u-boot-imx8qmmek.bin-sd -O u-boot.bin
+	@$(WGET) -q $(SERVER)/$(DIR)/imx-boot/imx-boot-tools/imx8qm/mx8qm-ahab-container.img -O mx8qm-ahab-container.img
 	@$(WGET) -qr -nd -l1 -np $(SERVER)/$(DIR) -P boot -A "Image-*imx8qm*"
-	@$(WGET) -q https://bitbucket.sw.nxp.com/projects/IMX/repos/linux-firmware-imx/raw/firmware/seco/mx8qm-ahab-container.img?at=refs%2Fheads%2Fmaster -O mx8qm-ahab-container.img
 	@$(RENAME) "Image-" "" boot/*.dtb
 
diff --git a/iMX8QX/soc.mak b/iMX8QX/soc.mak
index d51f6503f0b4334a8139a851206605c203f812f2..a4fe4dba5ff3fe87c9be314caa2c93cd601ac18c 100644
--- a/iMX8QX/soc.mak
+++ b/iMX8QX/soc.mak
@@ -24,7 +24,9 @@ DDR_TRAIN ?= 1
 WGET = /usr/bin/wget
 N ?= latest
 SERVER=http://yb2.am.freescale.net
-DIR = internal-only/Linux_IMX_Rocko_MX8/$(N)/common_bsp
+#DIR = internal-only/Linux_IMX_Rocko_MX8/$(N)/common_bsp
+#DIR = internal-only/Linux_IMX_Core/$(N)/common_bsp
+DIR = internal-only/Linux_IMX_Regression/$(N)/common_bsp
 
 #define the F(Q)SPI header file
 QSPI_HEADER = ../scripts/fspi_header