diff --git a/openpower/package/ocmb-explorer-fw/Config.in b/openpower/package/ocmb-explorer-fw/Config.in
index 1be3026..8bd223c 100644
--- a/openpower/package/ocmb-explorer-fw/Config.in
+++ b/openpower/package/ocmb-explorer-fw/Config.in
@@ -1,35 +1,21 @@
 config BR2_PACKAGE_OCMB_EXPLORER_FW
-        bool "ocmb_explorer_fw"
+        bool "ocmb-explorer-fw"
         default n
         help
             Project to stage ocmb explorer fw and binary image releases
 
 if BR2_PACKAGE_OCMB_EXPLORER_FW
 
-choice
-	prompt "OCMB Explorer Binary version"
-	default BR2_OCMB_EXPLORER_FW_LATEST_VERSION
-
-config BR2_OCMB_EXPLORER_FW_LATEST_VERSION
-	bool "Use latest OCMB_EXPLORER_FW master"
-
-config BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
-	bool "Custom OCMB_EXPLORER_FW version"
-
-endchoice
-
-config BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION_VALUE
-	string "Open CAPI Memory Buffer Firmware version"
-	depends on BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
-
 config BR2_OCMB_EXPLORER_FW_VERSION
 	string
-	default "v6.0" if BR2_OCMB_EXPLORER_FW_LATEST_VERSION
-	default BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION_VALUE \
-		if BR2_OCMB_EXPLORER_FW_CUSTOM_VERSION
+	default "v6.0"
 
-config BR2_OCMB_EXPLORER_FW_URL
+config BR2_OCMB_EXPLORER_FW_SITE
         string
-        default "https://github.com/open-power/ocmb-explorer-fw"
+        default "https://github.com/open-power/ocmb-explorer-fw/files/4989167"
+
+config BR2_OCMB_EXPLORER_FW_SOURCE
+        string
+        default "FWCL395423BinaryOnly.zip"
 
 endif
diff --git a/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk b/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
index 9aa4eb1..178a3e5 100644
--- a/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
+++ b/openpower/package/ocmb-explorer-fw/ocmb_explorer_fw.mk
@@ -6,22 +6,23 @@
 
 
 OCMB_EXPLORER_FW_VERSION ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_VERSION))
-OCMB_EXPLORER_FW_SOURCE ?= $(call qstrip,$(BR2_OCMBFW_FILENAME))
-OCMB_EXPLORER_FW_SITE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_URL))/releases/download/$(BR2_OCMB_EXPLORER_FW_VERSION)
+OCMB_EXPLORER_FW_SOURCE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_SOURCE))
+OCMB_EXPLORER_FW_SITE ?= $(call qstrip,$(BR2_OCMB_EXPLORER_FW_SITE))
 
 OCMB_EXPLORER_FW_LICENSE = Apache-2.0
-OCMB_EXPLORER_FW_LICENSE_FILES = LICENSE
+OCMB_EXPLORER_FW_LICENSE_FILES = LICENSE.pdf
 
 OCMB_EXPLORER_FW_INSTALL_IMAGES = YES
 OCMB_EXPLORER_FW_INSTALL_TARGET = NO
 
 # Commands to extract and install the Open Capi Memory Buffer Firmware (OCMBFW)
 define OCMB_EXPLORER_FW_INSTALL_IMAGES_CMDS
-      $(INSTALL) -D $(@D)/$(OCMB_EXPLORER_FW_SOURCE) $(BINARIES_DIR)/
+      $(INSTALL) -D $(@D)/$(call qstrip,$(BR2_OCMBFW_FILENAME)) $(BINARIES_DIR)/
 endef
 
 define OCMB_EXPLORER_FW_EXTRACT_CMDS
-      cp $(DL_DIR)/ocmb-explorer-fw/$(OCMB_EXPLORER_FW_SOURCE) $(@D)/
+      $(UNZIP) -d $(@D) $(OCMB_EXPLORER_FW_DL_DIR)/$(OCMB_EXPLORER_FW_SOURCE)
+      mv $(@D)/*LICENSE*.pdf $(@D)/LICENSE.pdf
 endef
 
 $(eval $(generic-package))
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 2601887..9b8f60a 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -118,6 +118,10 @@
     OCC_BIN_FILENAME=$(BR2_OCC_BIN_FILENAME)
 endif
 
+ifeq ($(BR2_PACKAGE_OCMB_EXPLORER_FW),y)
+    OCMB_EXPLORER_FW_URL=$(call qstrip,$(OCMB_EXPLORER_FW_SITE)/$(OCMB_EXPLORER_FW_SOURCE))
+endif
+
 DEVTREE_BLOB_FILENAME = ""
 ifeq ($(BR2_OPENPOWER_POWER10),y)
     DEVTREE_BLOB_FILENAME = $(DEVTREE_BIN_DIR)/$(BMC_POWER_TARGET_FILENAME)
@@ -155,7 +159,7 @@
             -binary_dir $(BINARIES_DIR) \
             -bootkernel_filename $(LINUX_IMAGE_NAME) \
 	    -ocmbfw_version $(OCMB_EXPLORER_FW_VERSION) \
-	    -ocmbfw_url $(BR2_OCMB_EXPLORER_FW_URL) \
+	    -ocmbfw_url $(OCMB_EXPLORER_FW_URL) \
 	    -ocmbfw_original_filename $(BINARIES_DIR)/$(BR2_OCMBFW_FILENAME) \
 	    -ocmbfw_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_PROCESSED_FILENAME) \
             -pnor_layout $(@D)/"$(OPENPOWER_RELEASE)"Layouts/$(BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME) \