diff --git a/repos/os/lib/mk/spec/imx53/tz_vmm.inc b/repos/os/lib/mk/spec/imx53/tz_vmm.inc
new file mode 100644
index 0000000000..2620ec2697
--- /dev/null
+++ b/repos/os/lib/mk/spec/imx53/tz_vmm.inc
@@ -0,0 +1,6 @@
+LIBS     += base config
+SRC_CC   += serial.cc block.cc spec/imx53/main.cc
+INC_DIR  += $(REP_DIR)/src/server/tz_vmm/spec/imx53
+INC_DIR  += $(REP_DIR)/src/server/tz_vmm/include
+
+vpath % $(REP_DIR)/src/server/tz_vmm
diff --git a/repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk b/repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk
new file mode 100644
index 0000000000..ade453b724
--- /dev/null
+++ b/repos/os/lib/mk/spec/imx53_qsb/tz_vmm.mk
@@ -0,0 +1,4 @@
+INC_DIR += $(REP_DIR)/src/server/tz_vmm/spec/imx53_qsb
+SRC_CC  += spec/imx53_qsb/vm.cc
+
+include $(REP_DIR)/lib/mk/spec/imx53/tz_vmm.inc
diff --git a/repos/os/lib/mk/spec/usb_armory/tz_vmm.mk b/repos/os/lib/mk/spec/usb_armory/tz_vmm.mk
new file mode 100644
index 0000000000..2b26db61bc
--- /dev/null
+++ b/repos/os/lib/mk/spec/usb_armory/tz_vmm.mk
@@ -0,0 +1,4 @@
+INC_DIR += $(REP_DIR)/src/server/tz_vmm/spec/usb_armory
+SRC_CC  += spec/usb_armory/vm.cc
+
+include $(REP_DIR)/lib/mk/spec/imx53/tz_vmm.inc
diff --git a/repos/os/src/server/tz_vmm/empty.cc b/repos/os/src/server/tz_vmm/empty.cc
new file mode 100644
index 0000000000..066c1bf825
--- /dev/null
+++ b/repos/os/src/server/tz_vmm/empty.cc
@@ -0,0 +1,3 @@
+/*
+ * Dummy compilation unit needed to link a valid target.
+ */
diff --git a/repos/os/src/server/tz_vmm/spec/imx53/target.inc b/repos/os/src/server/tz_vmm/spec/imx53/target.inc
deleted file mode 100644
index 8db672a327..0000000000
--- a/repos/os/src/server/tz_vmm/spec/imx53/target.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET    = tz_vmm
-REQUIRES += trustzone imx53
-LIBS     += base
-LIBS     += config
-SRC_CC   += vm.cc
-SRC_CC   += main.cc
-SRC_CC   += serial.cc
-SRC_CC   += block.cc
-INC_DIR  += $(PRG_DIR)
-INC_DIR  += $(PRG_DIR)/../../include
-INC_DIR  += $(PRG_DIR)/../imx53
-
-vpath main.cc $(PRG_DIR)/../imx53
-vpath %       $(PRG_DIR)/../..
diff --git a/repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk b/repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk
deleted file mode 100644
index 90b397239d..0000000000
--- a/repos/os/src/server/tz_vmm/spec/imx53_qsb/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-REQUIRES = hw_imx53_qsb
-
-include $(PRG_DIR)/../imx53/target.inc
diff --git a/repos/os/src/server/tz_vmm/spec/usb_armory/target.mk b/repos/os/src/server/tz_vmm/spec/usb_armory/target.mk
deleted file mode 100644
index 8af994fdac..0000000000
--- a/repos/os/src/server/tz_vmm/spec/usb_armory/target.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-REQUIRES = hw_usb_armory
-
-include $(PRG_DIR)/../imx53/target.inc
diff --git a/repos/os/src/server/tz_vmm/target.mk b/repos/os/src/server/tz_vmm/target.mk
new file mode 100644
index 0000000000..2a8d141c69
--- /dev/null
+++ b/repos/os/src/server/tz_vmm/target.mk
@@ -0,0 +1,3 @@
+TARGET  = tz_vmm
+LIBS   += tz_vmm
+SRC_CC += empty.cc