diff --git a/sysutils/vmware/+POST_INSTALL b/sysutils/vmware/+POST_INSTALL
index 65f37198a..502dc49d4 100644
--- a/sysutils/vmware/+POST_INSTALL
+++ b/sysutils/vmware/+POST_INSTALL
@@ -1,9 +1,2 @@
-touch /boot/loader.conf
-cp /boot/loader.conf /boot/loader.conf.bak
-(grep -v '^vmxnet_load=' /boot/loader.conf.bak; \
-    echo 'vmxnet_load="YES"') > /boot/loader.conf
-rm -f /boot/loader.conf.bak
-
-configctl template reload OPNsense.VMware
-
-/usr/local/opnsense/scripts/vmware/setup.sh
+/usr/local/etc/rc.syshook.d/vmware.early
+/usr/local/etc/rc.syshook.d/vmware.start
diff --git a/sysutils/vmware/+PRE_DEINSTALL b/sysutils/vmware/+PRE_DEINSTALL
deleted file mode 100644
index ff2ff951f..000000000
--- a/sysutils/vmware/+PRE_DEINSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-touch /boot/loader.conf
-cp /boot/loader.conf /boot/loader.conf.bak
-(grep -v '^vmxnet_load=' /boot/loader.conf.bak) > /boot/loader.conf
-rm -f /boot/loader.conf.bak
diff --git a/sysutils/vmware/Makefile b/sysutils/vmware/Makefile
index 24ae4d2f0..0f0d3180f 100644
--- a/sysutils/vmware/Makefile
+++ b/sysutils/vmware/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		vmware
-PLUGIN_VERSION=		1.2
+PLUGIN_VERSION=		1.3
 PLUGIN_COMMENT=		VMware tools wrapper
 PLUGIN_DEPENDS=		open-vm-tools-nox11
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/sysutils/vmware/src/opnsense/scripts/vmware/setup.sh b/sysutils/vmware/src/etc/rc.syshook.d/vmware.early
similarity index 74%
rename from sysutils/vmware/src/opnsense/scripts/vmware/setup.sh
rename to sysutils/vmware/src/etc/rc.syshook.d/vmware.early
index d1002d592..18ceeda02 100755
--- a/sysutils/vmware/src/opnsense/scripts/vmware/setup.sh
+++ b/sysutils/vmware/src/etc/rc.syshook.d/vmware.early
@@ -4,7 +4,5 @@ export vmware_guest_vmblock_enable="YES"
 export vmware_guest_vmhgfs_enable="YES"
 export vmware_guest_vmmemctl_enable="YES"
 export vmware_guest_vmxnet_enable="YES"
-export vmware_guestd_enable="YES"
 
 /usr/local/etc/rc.d/vmware-kmod start
-/usr/local/etc/rc.d/vmware-guestd start
diff --git a/sysutils/vmware/src/etc/rc.syshook.d/vmware.start b/sysutils/vmware/src/etc/rc.syshook.d/vmware.start
new file mode 100755
index 000000000..0c8593e4e
--- /dev/null
+++ b/sysutils/vmware/src/etc/rc.syshook.d/vmware.start
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export vmware_guestd_enable="YES"
+
+/usr/local/etc/rc.d/vmware-guestd start
diff --git a/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/+MANIFEST b/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/+MANIFEST
deleted file mode 100644
index 8dac48610..000000000
--- a/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/+MANIFEST
+++ /dev/null
@@ -1,8 +0,0 @@
-name: os-vmware
-version: 1.0
-origin: opnsense/os-vmware
-comment: VMware tools wrapper
-desc: do we really need this file, Ad?
-maintainer: franco@opnsense.org
-www: https://opnsense.org
-prefix: /
diff --git a/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/+TARGETS b/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/+TARGETS
deleted file mode 100644
index 570d9b1c5..000000000
--- a/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/+TARGETS
+++ /dev/null
@@ -1 +0,0 @@
-rc.conf.d:/etc/rc.conf.d/vmware
diff --git a/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/rc.conf.d b/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/rc.conf.d
deleted file mode 100644
index 4350c6aa5..000000000
--- a/sysutils/vmware/src/opnsense/service/templates/OPNsense/VMware/rc.conf.d
+++ /dev/null
@@ -1,2 +0,0 @@
-# rc vars for open-vm-tools are dynamic, so launch the launcher
-/usr/local/opnsense/scripts/vmware/setup.sh