diff --git a/openpower/configs/everest_defconfig b/openpower/configs/everest_defconfig
index b6146a3..c720a4f 100644
--- a/openpower/configs/everest_defconfig
+++ b/openpower/configs/everest_defconfig
@@ -50,19 +50,22 @@
 # BR2_PACKAGE_MACHINE_XML is not set
 BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
 BR2_RAINIER_2U_XML_CUSTOM_GIT=y
-BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_2U_XML_VERSION="88a6262d2ba89aae1807b8eaf9336889f7c41799"
+# TODO: Update the level when the XML is synced to public
+BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/rainier-xml.git"
+BR2_RAINIER_2U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
 BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
 BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
 BR2_RAINIER_4U_XML_CUSTOM_GIT=y
-BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
-BR2_RAINIER_4U_XML_VERSION="88a6262d2ba89aae1807b8eaf9336889f7c41799"
+# TODO: Update the level when the XML is synced to public
+BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/rainier-xml.git"
+BR2_RAINIER_4U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
 BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
 BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"
 BR2_PACKAGE_EVEREST_XML=y
 BR2_EVEREST_XML_CUSTOM_GIT=y
-BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/everest-xml.git"
-BR2_EVEREST_XML_VERSION="3cb28a0d4b71ab6ff697b15d65660370a5139a3b"
+# TODO: Update the level when the XML is synced to public
+BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/everest-xml.git"
+BR2_EVEREST_XML_VERSION="1784d76d77a917fc97f9614aa47687db45bfb955"
 BR2_EVEREST_XML_SYSTEM_FILENAME="Everest-MRW_hb.system.xml"
 BR2_EVEREST_XML_TARGETING_FILENAME="Everest-MRW_hb.mrw.xml"
 BR2_PACKAGE_OPENPOWER_PNOR_P10=y
diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
index 3b68089..ac86456 100644
--- a/openpower/configs/p10ebmc_defconfig
+++ b/openpower/configs/p10ebmc_defconfig
@@ -50,18 +50,21 @@
 # BR2_PACKAGE_MACHINE_XML is not set
 BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
 BR2_RAINIER_2U_XML_CUSTOM_GIT=y
-BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
+# TODO: Update the level when the XML is synced to public
+BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/rainier-xml.git"
 BR2_RAINIER_2U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
 BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
 BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
 BR2_RAINIER_4U_XML_CUSTOM_GIT=y
-BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
+# TODO: Update the level when the XML is synced to public
+BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/rainier-xml.git"
 BR2_RAINIER_4U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
 BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
 BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"
 BR2_PACKAGE_EVEREST_XML=y
 BR2_EVEREST_XML_CUSTOM_GIT=y
-BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/everest-xml.git"
+# TODO: Update the level when the XML is synced to public
+BR2_EVEREST_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/everest-xml.git"
 BR2_EVEREST_XML_VERSION="1784d76d77a917fc97f9614aa47687db45bfb955"
 BR2_EVEREST_XML_SYSTEM_FILENAME="Everest-MRW_hb.system.xml"
 BR2_EVEREST_XML_TARGETING_FILENAME="Everest-MRW_hb.mrw.xml"
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 12e689e..4d4ea1b 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -50,12 +50,14 @@
 # BR2_PACKAGE_MACHINE_XML is not set
 BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT=y
 BR2_RAINIER_2U_XML_CUSTOM_GIT=y
-BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
+# TODO: Update the level when the XML is synced to public
+BR2_RAINIER_2U_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/rainier-xml.git"
 BR2_RAINIER_2U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
 BR2_RAINIER_2U_XML_SYSTEM_FILENAME="Rainier-2U-MRW_hb.system.xml"
 BR2_RAINIER_2U_XML_TARGETING_FILENAME="Rainier-2U-MRW_hb.mrw.xml"
 BR2_RAINIER_4U_XML_CUSTOM_GIT=y
-BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.ibm.com:openbmc/rainier-xml.git"
+# TODO: Update the level when the XML is synced to public
+BR2_RAINIER_4U_XML_CUSTOM_GIT_VALUE="git@github.com:open-power/rainier-xml.git"
 BR2_RAINIER_4U_XML_VERSION="07073d927cb70cb074ce57d06f8b9a291716f654"
 BR2_RAINIER_4U_XML_SYSTEM_FILENAME="Rainier-4U-MRW_hb.system.xml"
 BR2_RAINIER_4U_XML_TARGETING_FILENAME="Rainier-4U-MRW_hb.mrw.xml"