diff --git a/mirror-image/define-mirror-vm.sh b/mirror-image/define-mirror-vm.sh
deleted file mode 100644
index 70336d3..0000000
--- a/mirror-image/define-mirror-vm.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash -xe
-
-MIRROR_VM_MGM_BRIDGE_NAME=${MIRROR_VM_MGM_BRIDGE_NAME:-"br-mgm"}
-MIRROR_VM_MEM_KB=${MIRROR_VM_MEM_KB:-"4194304"}
-MIRROR_VM_CPUS=${MIRROR_VM_CPUS:-"4"}
-
-if [[ -z ${MIRROR_VM_NAME} ]]; then
-  echo "ERROR: \$MIRROR_VM_NAME not set!"
-  exit 1
-fi
-
-cat <<EOF > $(pwd)/mirror-vm.xml
-<domain type='kvm'>
-  <name>$MIRROR_VM_NAME</name>
-  <memory unit='KiB'>$MIRROR_VM_MEM_KB</memory>
-  <currentMemory unit='KiB'>$MIRROR_VM_MEM_KB</currentMemory>
-  <vcpu placement='static'>$MIRROR_VM_CPUS</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type >hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/kvm-spice</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' cache='none'/>
-      <source file='$MIRROR_VM_SOURCE_DISK'/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='qemu' type='raw'/>
-      <source file='$MIRROR_VM_CONFIG_DISK'/>
-      <backingStore/>
-      <target dev='hda' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <interface type='bridge'>
-      <source bridge='$MIRROR_VM_MGM_BRIDGE_NAME'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </interface>
-    <serial type='pty'>
-      <source path='/dev/pts/1'/>
-      <target port='0'/>
-    </serial>
-    <console type='pty' tty='/dev/pts/1'>
-      <source path='/dev/pts/1'/>
-      <target type='serial' port='0'/>
-    </console>
-    <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-    </graphics>
-  </devices>
-</domain>
-EOF
-
-echo "INFO: rendered VM config:"
-cat $(pwd)/mirror-vm.xml
-
-virsh define $(pwd)/mirror-vm.xml
-virsh autostart ${MIRROR_VM_NAME}
diff --git a/mirror-image/define-mirror-vm.sh b/mirror-image/define-mirror-vm.sh
new file mode 120000
index 0000000..40a721b
--- /dev/null
+++ b/mirror-image/define-mirror-vm.sh
@@ -0,0 +1 @@
+../predefine-vm/define-vm.sh
\ No newline at end of file
diff --git a/predefine-vm/define-vm.sh b/predefine-vm/define-vm.sh
new file mode 100755
index 0000000..4457105
--- /dev/null
+++ b/predefine-vm/define-vm.sh
@@ -0,0 +1,98 @@
+#!/bin/bash -xe
+
+VM_MGM_BRIDGE_NAME=${VM_MGM_BRIDGE_NAME:-"br-mgm"}
+VM_MEM_KB=${VM_MEM_KB:-"4194304"}
+VM_CPUS=${VM_CPUS:-"4"}
+
+if [[ -z ${VM_NAME} ]]; then
+  echo "ERROR: \$VM_NAME not set!"
+  exit 1
+fi
+if [[ ! -f ${VM_SOURCE_DISK} ]] || [[ -z ${VM_SOURCE_DISK} ]]; then
+  echo "ERROR: \$VM_SOURCE_DISK not set, or file does not exist!"
+  exit 1
+fi
+if [[ ! -f ${VM_CONFIG_DISK} ]] || [[ -z ${VM_CONFIG_DISK} ]]; then
+  echo "ERROR: \$VM_CONFIG_DISK not set, or file does not exist!"
+  exit 1
+fi
+
+# Template definition
+cat <<EOF > $(pwd)/${VM_NAME}-vm.xml
+<domain type='kvm'>
+  <name>$VM_NAME</name>
+  <memory unit='KiB'>$VM_MEM_KB</memory>
+  <currentMemory unit='KiB'>$VM_MEM_KB</currentMemory>
+  <vcpu placement='static'>$VM_CPUS</vcpu>
+  <resource>
+    <partition>/machine</partition>
+  </resource>
+  <os>
+    <type >hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <clock offset='utc'>
+    <timer name='rtc' tickpolicy='catchup'/>
+    <timer name='pit' tickpolicy='delay'/>
+    <timer name='hpet' present='no'/>
+  </clock>
+  <pm>
+    <suspend-to-mem enabled='no'/>
+    <suspend-to-disk enabled='no'/>
+  </pm>
+  <devices>
+    <emulator>/usr/bin/kvm-spice</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2' cache='none'/>
+      <source file='$VM_SOURCE_DISK'/>
+      <target dev='vda' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </disk>
+    <disk type='file' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source file='$VM_CONFIG_DISK'/>
+      <backingStore/>
+      <target dev='hda' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+    </disk>
+    <interface type='bridge'>
+      <source bridge='$VM_MGM_BRIDGE_NAME'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </interface>
+EOF
+if [[ -n ${VM_CTL_BRIDGE_NAME} ]]; then
+echo "\$VM_CTL_BRIDGE_NAME detected, adding one more nic to VM"
+cat <<EOF >> $(pwd)/${VM_NAME}-vm.xml
+    <interface type='bridge'>
+      <source bridge='$VM_CTL_BRIDGE_NAME'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </interface>
+EOF
+fi
+cat <<EOF >> $(pwd)/${VM_NAME}-vm.xml
+    <serial type='pty'>
+      <source path='/dev/pts/1'/>
+      <target port='0'/>
+    </serial>
+    <console type='pty' tty='/dev/pts/1'>
+      <source path='/dev/pts/1'/>
+      <target type='serial' port='0'/>
+    </console>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
+  </devices>
+</domain>
+EOF
+
+echo "INFO: rendered VM config:"
+cat $(pwd)/${VM_NAME}-vm.xml
+
+virsh define $(pwd)/${VM_NAME}-vm.xml
+virsh autostart ${VM_NAME}