diff --git a/tr104/Config.in b/tr104/Config.in
index 399ec1959..82aec5808 100644
--- a/tr104/Config.in
+++ b/tr104/Config.in
@@ -1,3 +1,5 @@
+if PACKAGE_tr104
+
 config TR104_RUNAS_BBFDM_MICROSERVICE
 	bool "Use bbfdmd datamodel microservice to run tr104, preferred if TR104 and BBFDMD are on different base"
 	depends on PACKAGE_tr104
@@ -7,3 +9,8 @@ config TR104_VENDOR_EXTENSIONS
 	bool "Use TR104 vendor extensions"
 	depends on PACKAGE_tr104
 	default y
+
+config TR104_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+endif
diff --git a/tr104/Makefile b/tr104/Makefile
index 448736572..0dedc11ad 100644
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.36
+PKG_VERSION:=1.0.37
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
@@ -43,8 +43,14 @@ define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config.in"
 endef
 
+ifeq ($(CONFIG_TR104_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_TR104_VENDOR_PREFIX)
+endif
+
 CMAKE_OPTIONS += \
-	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
+	-DBBF_VENDOR_PREFIX:String="$(VENDOR_PREFIX)" \
 	-DDAEMON_JSON_INPUT:String="/etc/tr104/input.json" \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-DDM_ENABLE_UBUS:BOOL=ON