diff --git a/openpower/package/ekb/ekb.mk b/openpower/package/ekb/ekb.mk
index 37d77ac..a9bf202 100644
--- a/openpower/package/ekb/ekb.mk
+++ b/openpower/package/ekb/ekb.mk
@@ -5,11 +5,7 @@
 ################################################################################
 
 EKB_VERSION = $(call qstrip,$(BR2_EKB_VERSION))
-# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
-# after that, when code is propagated to a public repo
-#EKB_SITE = $(call github,openbmc,ekb,$(EKB_VERSION))
-EKB_SITE = git@github.ibm.com:openbmc/pub-ekb.git
-EKB_SITE_METHOD = git
+EKB_SITE = $(call github,open-power,pub-ekb,$(EKB_VERSION))
 
 EKB_INSTALL_STAGING = YES
 EKB_INSTALL_TARGET = NO
diff --git a/openpower/package/hcode-p10/hcode-p10.mk b/openpower/package/hcode-p10/hcode-p10.mk
index 2dfd59e..3d3eda6 100644
--- a/openpower/package/hcode-p10/hcode-p10.mk
+++ b/openpower/package/hcode-p10/hcode-p10.mk
@@ -5,11 +5,7 @@
 ################################################################################
 
 HCODE_P10_VERSION = $(call qstrip,$(BR2_HCODE_P10_VERSION))
-#HCODE_P10_SITE ?= $(call github,open-power,hcode,$(HCODE_P10_VERSION))
-# TODO: Need to comment out above line and enable next two lines
-# once buildable P10 HCODE is available in GHE
-HCODE_P10_SITE ?= git@github.ibm.com:open-power/hcode.git
-HCODE_P10_SITE_METHOD ?= git
+HCODE_P10_SITE ?= $(call github,open-power,hcode,$(HCODE_P10_VERSION))
 HCODE_P10_LICENSE = Apache-2.0
 
 HCODE_P10_INSTALL_IMAGES = YES
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index bff9670..bd529dd 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -5,11 +5,7 @@
 ################################################################################
 
 HOSTBOOT_BINARIES_VERSION = $(call qstrip,$(BR2_HOSTBOOT_BINARIES_VERSION))
-# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
-# after that, when code is propagated to a public repo
-#HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
-HOSTBOOT_BINARIES_SITE ?= git@github.ibm.com:open-power/hostboot-binaries.git
-HOSTBOOT_BINARIES_SITE_METHOD ?= git
+HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
 
 HOSTBOOT_BINARIES_LICENSE = Apache-2.0
 HOSTBOOT_BINARIES_LICENSE_FILES = LICENSE
diff --git a/openpower/package/hostboot-p10/hostboot-p10.mk b/openpower/package/hostboot-p10/hostboot-p10.mk
index f5c1d31..ef460d5 100644
--- a/openpower/package/hostboot-p10/hostboot-p10.mk
+++ b/openpower/package/hostboot-p10/hostboot-p10.mk
@@ -5,11 +5,7 @@
 ################################################################################
 
 HOSTBOOT_P10_VERSION = $(call qstrip,$(BR2_HOSTBOOT_P10_VERSION))
-# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
-# after that, when code is propagated to a public repo
-#HOSTBOOT_P10_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P10_VERSION))
-HOSTBOOT_P10_SITE ?= git@github.ibm.com:open-power/hostboot.git
-HOSTBOOT_P10_SITE_METHOD ?= git
+HOSTBOOT_P10_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P10_VERSION))
 
 HOSTBOOT_P10_LICENSE = Apache-2.0
 HOSTBOOT_P10_LICENSE_FILES = LICENSE
diff --git a/openpower/package/ima-catalog/ima-catalog.mk b/openpower/package/ima-catalog/ima-catalog.mk
index 0cd071d..d2c6c8e 100644
--- a/openpower/package/ima-catalog/ima-catalog.mk
+++ b/openpower/package/ima-catalog/ima-catalog.mk
@@ -5,8 +5,6 @@
 ################################################################################
 IMA_CATALOG_VERSION ?= 4eac568d676ee106ee12504552e41230f43e8080
 IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
-#IMA_CATALOG_SITE ?= git@github.ibm.com:open-power/ima-catalog.git
-#IMA_CATALOG_SITE_METHOD ?= git
 IMA_CATALOG_LICENSE = Apache-2.0
 IMA_CATALOG_DEPENDENCIES = host-dtc host-xz
 
diff --git a/openpower/package/occ-p10/occ-p10.mk b/openpower/package/occ-p10/occ-p10.mk
index 64be388..fa60167 100644
--- a/openpower/package/occ-p10/occ-p10.mk
+++ b/openpower/package/occ-p10/occ-p10.mk
@@ -5,11 +5,7 @@
 ################################################################################
 
 OCC_P10_VERSION = $(call qstrip,$(BR2_OCC_P10_VERSION))
-# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
-# after that, when code is propagated to a public repo
-#OCC_P10_SITE ?= $(call github,open-power,occ,$(OCC_P10_VERSION))
-OCC_P10_SITE ?= git@github.ibm.com:open-power/occ.git
-OCC_P10_SITE_METHOD ?= git
+OCC_P10_SITE ?= $(call github,open-power,occ,$(OCC_P10_VERSION))
 
 OCC_P10_LICENSE = Apache-2.0
 
diff --git a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
index 87d7b63..79f8cdc 100644
--- a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
+++ b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
@@ -5,12 +5,7 @@
 ################################################################################
 
 OPENPOWER_PNOR_P10_VERSION ?= b63d81085a4ab5582185c2370b4624701c79c127
-
-# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
-# after that, when code is propagated to a public repo
-#OPENPOWER_PNOR_P10_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_P10_VERSION))
-OPENPOWER_PNOR_P10_SITE = git@github.ibm.com:open-power/pnor.git
-OPENPOWER_PNOR_P10_SITE_METHOD=git
+OPENPOWER_PNOR_P10_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_P10_VERSION))
 
 OPENPOWER_PNOR_P10_LICENSE = Apache-2.0
 OPENPOWER_PNOR_P10_LICENSE_FILES = LICENSE
diff --git a/openpower/package/pdata/Config.in b/openpower/package/pdata/Config.in
index 5138389..1d2b30c 100644
--- a/openpower/package/pdata/Config.in
+++ b/openpower/package/pdata/Config.in
@@ -47,7 +47,7 @@
 
 config BR2_PDATA_VERSION
     string
-    default "3eefd120f18edc1be3f6c9e38f646302bc56bad9" if BR2_PDATA_LATEST_VERSION
+    default "ea61ffb90de8b73b1f4d599381f904dedc92b011" if BR2_PDATA_LATEST_VERSION
     default BR2_PDATA_CUSTOM_VERSION_VALUE if BR2_PDATA_CUSTOM_VERSION
 
 endif
diff --git a/openpower/package/pdata/pdata.mk b/openpower/package/pdata/pdata.mk
index b1500ba..62e5fef 100644
--- a/openpower/package/pdata/pdata.mk
+++ b/openpower/package/pdata/pdata.mk
@@ -6,10 +6,7 @@
 
 PDATA_VERSION = $(call qstrip,$(BR2_PDATA_VERSION))
 ifeq ($(BR2_PDATA_GITHUB_PROJECT),y)
-# after that, when code is propagated to a public repo
-#PDATA_SITE = $(call github,phal,pdata,$(PDATA_VERSION))
-PDATA_SITE = git@github.ibm.com:phal/pdata.git
-PDATA_SITE_METHOD = git
+PDATA_SITE = $(call github,open-power,pdata,$(PDATA_VERSION))
 else ifeq ($(BR2_PDATA_CUSTOM_GIT),y)
 PDATA_SITE = $(BR2_PDATA_CUSTOM_GIT_VALUE)
 PDATA_SITE_METHOD = git
diff --git a/openpower/package/sbe-p10/sbe-p10.mk b/openpower/package/sbe-p10/sbe-p10.mk
index de85d15..b433e35 100644
--- a/openpower/package/sbe-p10/sbe-p10.mk
+++ b/openpower/package/sbe-p10/sbe-p10.mk
@@ -5,11 +5,7 @@
 ################################################################################
 
 SBE_P10_VERSION = $(call qstrip,$(BR2_SBE_P10_VERSION))
-# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
-# after that, when code is propagated to a public repo
-#SBE_P10_SITE ?= $(call github,open-power,sbe,$(SBE_P10_VERSION))
-SBE_P10_SITE ?= git@github.ibm.com:open-power/sbe.git
-SBE_P10_SITE_METHOD ?= git
+SBE_P10_SITE ?= $(call github,open-power,sbe,$(SBE_P10_VERSION))
 
 SBE_P10_LICENSE = Apache-2.0
 SBE_P10_DEPENDENCIES = host-ppe42-gcc hcode-p10