diff --git a/.gitmodules b/.gitmodules
index 5cda80d..0a83da8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "buildroot"]
 	path = buildroot
 	branch = master-p10
-	url = git@github.ibm.com:klausk/buildroot.git
+	url = git@github.ibm.com:open-power/buildroot.git
diff --git a/buildroot b/buildroot
index 1b15050..3ca8831 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 1b15050b336859fa3e7e7a3cbf2483565e64e52c
+Subproject commit 3ca883117013a554e5dcedbcde9f715a90d9ff70
diff --git a/openpower/configs/denali_defconfig b/openpower/configs/denali_defconfig
index 6afce38..4696b77 100644
--- a/openpower/configs/denali_defconfig
+++ b/openpower/configs/denali_defconfig
@@ -15,7 +15,7 @@
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@github.ibm.com:p10/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f607d43b7d6e54f2610933ea2da9f9732237cb51"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e4f7620c0a1e46e93ab9130f30bfa28b32322ca1"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux-p10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index ff01393..c9a1b3d 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -17,7 +17,7 @@
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git@github.ibm.com:p10/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="98642ab42d85ff4f0ee72300856020ea0bca2e90"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e4f7620c0a1e46e93ab9130f30bfa28b32322ca1"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux-p10"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 07e2c20..7236ce3 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "v6.6-283-gb74318a54" if BR2_SKIBOOT_LATEST_VERSION
+	default "v6.6-284-gfa82b1a28" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION