diff --git a/userspace/Makefile.tmk b/userspace/Makefile.tmk
index 3fdff9f54..615677cd0 100644
--- a/userspace/Makefile.tmk
+++ b/userspace/Makefile.tmk
@@ -66,34 +66,15 @@ NV_UNIT_SH=unit.sh
 NV_SUBMIT_UNIT_SH=nvgpu_submit_unit.sh
 NV_TESTLIST_PY=testlist.py
 NV_REQ_TESTS_INI=required_tests.ini
-NV_NETD_IMG=NETD_img.bin
-NV_FECS_IMG=fecs.bin
-NV_FECS_SIG_IMG=fecs_sig.bin
-NV_GPCCS_IMG=gpccs.bin
-NV_GPCCS_SIG_IMG=gpccs_sig.bin
-NV_ACR_UCODE_PROD_IMG=acr_ucode_prod.bin
-NV_ACR_UCODE_DBG_IMG=acr_ucode_dbg.bin
-NV_PMU_BL_IMG=pmu_bl.bin
 NV_COMPONENT_SYSTEMIMAGE_DIR    := $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/nvgpu_unit
-NV_UNIT_REQ_FIRMWARE_DIR        := $(NV_COMPONENT_SYSTEMIMAGE_DIR)/firmware/gv11b
 systemimage:: $(NV_COMPONENT_SYSTEMIMAGE_DIR) $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_UNIT_SH) \
 	$(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)/$(NV_SUBMIT_UNIT_SH) \
 	$(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_TESTLIST_PY) \
-	$(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_INI) \
-	$(NV_UNIT_REQ_FIRMWARE_DIR) $(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_NETD_IMG) \
-	$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_IMG) \
-	$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_SIG_IMG) \
-	$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_IMG) \
-	$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_SIG_IMG) \
-	$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_PROD_IMG) \
-	$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_DBG_IMG) \
-	$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_PMU_BL_IMG)
+	$(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_INI)
 
 #make the output directory
 $(NV_COMPONENT_SYSTEMIMAGE_DIR) : $(NV_SYSTEMIMAGE_TEST_EXECUTABLE_DIR)
 	$(MKDIR_P) $@
-$(NV_UNIT_REQ_FIRMWARE_DIR) : $(NV_COMPONENT_SYSTEMIMAGE_DIR)
-	$(MKDIR_P) $@
 
 #copy the test script
 $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_UNIT_SH) : $(NV_COMPONENT_DIR)/$(NV_UNIT_SH) $(NV_COMPONENT_SYSTEMIMAGE_DIR)
@@ -105,22 +86,6 @@ $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_TESTLIST_PY) : $(NV_COMPONENT_DIR)/$(NV_TES
 	$(CP) $< $@
 $(NV_COMPONENT_SYSTEMIMAGE_DIR)/$(NV_REQ_TESTS_INI) : $(NV_COMPONENT_DIR)/$(NV_REQ_TESTS_INI) $(NV_COMPONENT_SYSTEMIMAGE_DIR)
 	$(CP) $< $@
-$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_NETD_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_NETD_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR)
-	$(CP) $< $@
-$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_FECS_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR)
-	$(CP) $< $@
-$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_FECS_SIG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_FECS_SIG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR)
-	$(CP) $< $@
-$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_GPCCS_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR)
-	$(CP) $< $@
-$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_GPCCS_SIG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_GPCCS_SIG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR)
-	$(CP) $< $@
-$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_PROD_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_ACR_UCODE_PROD_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR)
-	$(CP) $< $@
-$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_ACR_UCODE_DBG_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_ACR_UCODE_DBG_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR)
-	$(CP) $< $@
-$(NV_UNIT_REQ_FIRMWARE_DIR)/$(NV_PMU_BL_IMG) : $(NV_COMPONENT_DIR)/firmware/gv11b/$(NV_PMU_BL_IMG) $(NV_UNIT_REQ_FIRMWARE_DIR)
-	$(CP) $< $@
 
 include $(NV_BUILD_NVTEST_EXECUTABLE)
 
diff --git a/userspace/firmware/gv11b/NETD_img.bin b/userspace/firmware/gv11b/NETD_img.bin
deleted file mode 100644
index f80194cab..000000000
Binary files a/userspace/firmware/gv11b/NETD_img.bin and /dev/null differ
diff --git a/userspace/firmware/gv11b/acr_ucode.bin b/userspace/firmware/gv11b/acr_ucode.bin
deleted file mode 100644
index ffbdb1ce1..000000000
Binary files a/userspace/firmware/gv11b/acr_ucode.bin and /dev/null differ
diff --git a/userspace/firmware/gv11b/acr_ucode_dbg.bin b/userspace/firmware/gv11b/acr_ucode_dbg.bin
deleted file mode 100644
index ffbdb1ce1..000000000
Binary files a/userspace/firmware/gv11b/acr_ucode_dbg.bin and /dev/null differ
diff --git a/userspace/firmware/gv11b/acr_ucode_prod.bin b/userspace/firmware/gv11b/acr_ucode_prod.bin
deleted file mode 100644
index ffbdb1ce1..000000000
Binary files a/userspace/firmware/gv11b/acr_ucode_prod.bin and /dev/null differ
diff --git a/userspace/firmware/gv11b/fecs.bin b/userspace/firmware/gv11b/fecs.bin
deleted file mode 100644
index 2e3e996bb..000000000
Binary files a/userspace/firmware/gv11b/fecs.bin and /dev/null differ
diff --git a/userspace/firmware/gv11b/fecs_sig.bin b/userspace/firmware/gv11b/fecs_sig.bin
deleted file mode 100644
index 5762fdd10..000000000
Binary files a/userspace/firmware/gv11b/fecs_sig.bin and /dev/null differ
diff --git a/userspace/firmware/gv11b/gpccs.bin b/userspace/firmware/gv11b/gpccs.bin
deleted file mode 100644
index 2e3e996bb..000000000
Binary files a/userspace/firmware/gv11b/gpccs.bin and /dev/null differ
diff --git a/userspace/firmware/gv11b/gpccs_sig.bin b/userspace/firmware/gv11b/gpccs_sig.bin
deleted file mode 100644
index 5762fdd10..000000000
Binary files a/userspace/firmware/gv11b/gpccs_sig.bin and /dev/null differ
diff --git a/userspace/firmware/gv11b/pmu_bl.bin b/userspace/firmware/gv11b/pmu_bl.bin
deleted file mode 100644
index 269b1d247..000000000
Binary files a/userspace/firmware/gv11b/pmu_bl.bin and /dev/null differ
diff --git a/userspace/install-unit.sh b/userspace/install-unit.sh
index c26384d20..dadd50900 100755
--- a/userspace/install-unit.sh
+++ b/userspace/install-unit.sh
@@ -120,7 +120,6 @@ jcp $nvgpu_bins/libs/igpu-l4t_64/libnvgpu-drv-igpu.so nvgpu_unit/libnvgpu-drv-ig
 jcp $TOP/kernel/nvgpu/userspace/unit.sh                  nvgpu_unit/unit.sh
 jcp $TOP/kernel/nvgpu/userspace/gcov.sh                  nvgpu_unit/gcov.sh
 jcp $TOP/kernel/nvgpu/userspace/testlist.py              nvgpu_unit/testlist.py
-jcp $TOP/kernel/nvgpu/userspace/firmware/gv11b           nvgpu_unit/firmware/
 
 find $nvgpu_bins/userspace/units -name "*.so" -not -path "*unit.so" \
     -not -path "*drv.so" -exec du -b {} \; | sort -n | while read size unit_so ; do