diff --git a/Makefile b/Makefile
index 1ce9e8c..88a2f6a 100755
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@
 openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
 openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
 openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUStateTests.robot
-openonu-go-adapter-test: openonu-go-adapter-statetest
+openonu-go-adapter-test: openonu-go-adapter-tests
 
 # target to invoke test with openonu go adapter applying 1T4GEM tech-profile at single ONU
 1t4gem-openonu-go-adapter-test: ROBOT_MISC_ARGS += -v state2test:6 -v testmode:SingleStateTime -v timeout:180s
@@ -102,7 +102,7 @@
 1t4gem-openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
 1t4gem-openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
 1t4gem-openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUStateTests.robot
-1t4gem-openonu-go-adapter-test: openonu-go-adapter-statetest
+1t4gem-openonu-go-adapter-test: openonu-go-adapter-tests
 
 # target to invoke test with openonu go adapter applying 1T8GEM tech-profile at single ONU
 1t8gem-openonu-go-adapter-test: ROBOT_MISC_ARGS += -v state2test:6 -v testmode:SingleStateTime -v timeout:180s
@@ -111,7 +111,7 @@
 1t8gem-openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
 1t8gem-openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
 1t8gem-openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUStateTests.robot
-1t8gem-openonu-go-adapter-test: openonu-go-adapter-statetest
+1t8gem-openonu-go-adapter-test: openonu-go-adapter-tests
 
 # target to invoke multiple openonu go adapter
 multi-openonu-go-adapter-test: ROBOT_MISC_ARGS += -v state2test:6 -v testmode:SingleStateTime -v timeout:180s
@@ -119,7 +119,7 @@
 multi-openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
 multi-openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SCALE_MULT_ONU_FILE)
 multi-openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUStateTests.robot
-multi-openonu-go-adapter-test: openonu-go-adapter-statetest
+multi-openonu-go-adapter-test: openonu-go-adapter-tests
 
 # target to invoke test with openonu go adapter applying 1T4GEM tech-profile at multiple ONU
 multi-1t4gem-openonu-go-adapter-test: ROBOT_MISC_ARGS += -v state2test:6 -v testmode:SingleStateTime -v timeout:180s
@@ -128,7 +128,7 @@
 multi-1t4gem-openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
 multi-1t4gem-openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SCALE_MULT_ONU_FILE)
 multi-1t4gem-openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUStateTests.robot
-multi-1t4gem-openonu-go-adapter-test: openonu-go-adapter-statetest
+multi-1t4gem-openonu-go-adapter-test: openonu-go-adapter-tests
 
 # target to invoke test with openonu go adapter applying 1T8GEM tech-profile at multiple ONU
 multi-1t8gem-openonu-go-adapter-test: ROBOT_MISC_ARGS += -v state2test:6 -v testmode:SingleStateTime -v timeout:180s
@@ -137,7 +137,15 @@
 multi-1t8gem-openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
 multi-1t8gem-openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SCALE_MULT_ONU_FILE)
 multi-1t8gem-openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUStateTests.robot
-multi-1t8gem-openonu-go-adapter-test: openonu-go-adapter-statetest
+multi-1t8gem-openonu-go-adapter-test: openonu-go-adapter-tests
+
+# target to invoke test with openonu go adapter applying MIB-Upload-Templating
+mib-upload-templating-openonu-go-adapter-test: ROBOT_MISC_ARGS += -v timeout:60s -v logging:True
+mib-upload-templating-openonu-go-adapter-test: ROBOT_MISC_ARGS += -i onutest $(ROBOT_DEBUG_LOG_OPT)
+mib-upload-templating-openonu-go-adapter-test: ROBOT_MISC_ARGS += -X
+mib-upload-templating-openonu-go-adapter-test: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULT_PON_FILE)
+mib-upload-templating-openonu-go-adapter-test: ROBOT_FILE := Voltha_ONUTemplateTests.robot
+mib-upload-templating-openonu-go-adapter-test: openonu-go-adapter-tests
 
 sanity-single-kind: ROBOT_MISC_ARGS += -i sanity $(ROBOT_DEBUG_LOG_OPT)
 sanity-single-kind: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
@@ -239,7 +247,7 @@
 	cd tests/scale ;\
 	robot $(ROBOT_MISC_ARGS) Voltha_Scale_Tests.robot
 
-openonu-go-adapter-statetest: vst_venv
+openonu-go-adapter-tests: vst_venv
 	source ./$</bin/activate ; set -u ;\
 	cd tests/openonu-go-adapter ;\
 	robot -V $(ROBOT_CONFIG_FILE) $(ROBOT_MISC_ARGS) $(ROBOT_FILE)