diff --git a/openpower/configs/denali_defconfig b/openpower/configs/denali_defconfig
index e6f88c0..6afce38 100644
--- a/openpower/configs/denali_defconfig
+++ b/openpower/configs/denali_defconfig
@@ -57,10 +57,6 @@
 # BR2_PACKAGE_HCODE is not set
 # BR2_PACKAGE_OCC is not set
 # BR2_PACKAGE_CAPP_UCODE is not set
-BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="3fd43cf66b7a799cd309833d51cd81117a66aaef"
-BR2_SKIBOOT_CUSTOM_GIT=y
-BR2_SKIBOOT_CUSTOM_REPO_URL="git@github.ibm.com:p10/skiboot.git"
 BR2_PACKAGE_LOADKEYS=y
 # BR2_PACKAGE_HOST_PPE42_BINUTILS is not set
 # BR2_PACKAGE_HOST_PPE42_GCC is not set
diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index da78c33..5cb2926 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -69,10 +69,6 @@
 BR2_PACKAGE_PETITBOOT=y
 BR2_PACKAGE_PETITBOOT_MTD=y
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
-BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="b81f1465872ece79fbf9867e48905a30745759ef"
-BR2_SKIBOOT_CUSTOM_GIT=y
-BR2_SKIBOOT_CUSTOM_REPO_URL="git@github.ibm.com:p10/skiboot.git"
 BR2_PACKAGE_LOADKEYS=y
 BR2_IMA_CATALOG_DTS="POWER9"
 BR2_PACKAGE_OCMB_EXPLORER_FW=y
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 93d3a43..fe12a25 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,15 +31,17 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "v6.5-219-g53944d45" if BR2_SKIBOOT_LATEST_VERSION
+	default "v6.6-268-gc80eab0d3" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION
 
 config BR2_SKIBOOT_CUSTOM_GIT
 	bool "Custom git repository"
+	default y
 
 config BR2_SKIBOOT_CUSTOM_REPO_URL
 	string "URL of custom repository"
+	default "git@github.ibm.com:p10/skiboot.git"
 	depends on BR2_SKIBOOT_CUSTOM_GIT
 
 config BR2_SKIBOOT_DEVICETREE