diff --git a/deploy/overlays/collectd/etc/collectd-configuration.xml b/deploy/overlays/collectd/etc/collectd-configuration.xml
index 809b27a985bd..4829f6c494b0 100644
--- a/deploy/overlays/collectd/etc/collectd-configuration.xml
+++ b/deploy/overlays/collectd/etc/collectd-configuration.xml
@@ -28,84 +28,6 @@
          <parameter key="password" value="${requisition:cassandra-pass|cassandra-password}" />
       </service>
    </package>
-   <package name="vmware6" remote="false">
-      <filter>(IPADDR != '0.0.0.0') &amp; (categoryName == 'VMware6')</filter>
-      <service name="VMware-VirtualMachine" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default-VirtualMachine6}" />
-         <parameter key="thresholding-enabled" value="true" />
-      </service>
-      <service name="VMware-HostSystem" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default-HostSystem6}" />
-         <parameter key="thresholding-enabled" value="true" />
-      </service>
-      <service name="VMwareCim-HostSystem" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default-ESX-HostSystem}" />
-         <parameter key="thresholding-enabled" value="true" />
-      </service>
-   </package>
-   <package name="vmware7" remote="false">
-      <filter>(IPADDR != '0.0.0.0') &amp; (categoryName == 'VMware7')</filter>
-      <service name="VMware-VirtualMachine" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default-VirtualMachine7}" />
-         <parameter key="thresholding-enabled" value="true" />
-      </service>
-      <service name="VMware-HostSystem" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default-HostSystem7}" />
-         <parameter key="thresholding-enabled" value="true" />
-      </service>
-      <service name="VMwareCim-HostSystem" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default-ESX-HostSystem}" />
-         <parameter key="thresholding-enabled" value="true" />
-      </service>
-   </package>
-   <package name="opennms" remote="false">
-      <filter>IPADDR != '0.0.0.0'</filter>
-      <include-range begin="1.1.1.1" end="254.254.254.254" />
-      <include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
-      <service name="OpenNMS-JVM" interval="300000" user-defined="false" status="on">
-         <parameter key="port" value="${requisition:port|detector:port|18980}" />
-         <parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
-         <parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
-         <parameter key="rrd-base-name" value="java" />
-         <parameter key="collection" value="${requisition:collection|detector:collection|jsr160}" />
-         <parameter key="thresholding-enabled" value="true" />
-         <parameter key="ds-name" value="opennms-jvm" />
-         <parameter key="friendly-name" value="${requisition:friendly-name|detector:friendly-name|opennms-jvm}" />
-      </service>
-      <service name="JMX-Minion" interval="300000" user-defined="false" status="on">
-         <parameter key="port" value="${requisition:port|detector:port|18980}" />
-         <parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
-         <parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
-         <parameter key="rrd-base-name" value="java" />
-         <parameter key="collection" value="${requisition:collection|detector:collection|jmx-minion}" />
-         <parameter key="thresholding-enabled" value="true" />
-         <parameter key="ds-name" value="jmx-minion" />
-         <parameter key="friendly-name" value="${requisition:friendly-name|detector:friendly-name|jmx-minion}" />
-         <parameter key="use-foreign-id-as-system-id" value="${requisition:use-foreign-id-as-system-id|detector:use-foreign-id-as-system-id|true}" />
-      </service>
-      <service name="JMX-Kafka" interval="300000" user-defined="false" status="on">
-         <parameter key="port" value="${requisition:kafka-port|9999}" />
-         <parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
-         <parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
-         <parameter key="rrd-base-name" value="java" />
-         <parameter key="collection" value="${requisition:collection|detector:collection|jmx-kafka}" />
-         <parameter key="thresholding-enabled" value="true" />
-         <parameter key="ds-name" value="jmx-kafka" />
-         <parameter key="friendly-name" value="${requisition:friendly-name|detector:friendly-name|jmx-kafka}" />
-      </service>
-      <service name="OpenNMS-DB" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default}" />
-         <parameter key="thresholding-enabled" value="true" />
-         <parameter key="driver" value="${requisition:driver|detector:driver|org.postgresql.Driver}" />
-         <parameter key="data-source" value="${requisition:data-source|detector:data-source|opennms}" />
-      </service>
-      <service name="OpenNMS-DB-Stats" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|PostgreSQL}" />
-         <parameter key="thresholding-enabled" value="true" />
-         <parameter key="driver" value="${requisition:driver|detector:driver|org.postgresql.Driver}" />
-         <parameter key="data-source" value="${requisition:data-source|detector:data-source|opennms-monitor}" />
-      </service>
-   </package>
    <package name="nl6-lab" remote="false">
       <filter>IPADDR != '0.0.0.0'</filter>
       <include-range begin="10.0.0.1" end="10.0.0.255"/>
@@ -132,56 +54,16 @@
          <parameter key="collection" value="${requisition:collection|detector:collection|default}" />
          <parameter key="thresholding-enabled" value="true" />
       </service>
-      <service name="WMI" interval="300000" user-defined="false" status="off">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default}" />
-         <parameter key="thresholding-enabled" value="true" />
-      </service>
-      <service name="WS-Man" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|default}" />
-         <parameter key="thresholding-enabled" value="true" />
-      </service>
-      <service name="PostgreSQL" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|PostgreSQL}" />
-         <parameter key="thresholding-enabled" value="true" />
-         <parameter key="driver" value="${requisition:driver|detector:driver|org.postgresql.Driver}" />
-         <parameter key="user" value="${requisition:pg-user|postgres}" />
-         <parameter key="password" value="${requisition:pg-pass|postgres}" />
-         <parameter key="url" value="${requisition:url|detector:url|'jdbc:postgresql://OPENNMS_JDBC_HOSTNAME:5432/deltav'}" />
-      </service>
-      <service name="Elasticsearch" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|xml-elasticsearch-cluster-stats}" />
-         <parameter key="handler-class" value="${requisition:handler-class|detector:handler-class|org.opennms.protocols.json.collector.DefaultJsonCollectionHandler}" />
-      </service>
-      <service name="Windows-Exporter" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|windows-exporter}" />
-         <parameter key="thresholding-enabled" value="true" />
-	 <parameter key="url" value="http://${requisition:url|detector:url|INTERFACE_ADDRESS}:${requisition:port|9182}/metrics" />
-         <parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
-         <parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
-      </service>
-      <service name="Node-Exporter" interval="300000" user-defined="false" status="on">
-         <parameter key="collection" value="${requisition:collection|detector:collection|node-exporter}" />
-         <parameter key="thresholding-enabled" value="true" />
-	 <parameter key="url" value="http://${requisition:url|detector:url|INTERFACE_ADDRESS}:${requisition:port|9100}/metrics" />
-         <parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
-         <parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
-      </service>
    </package>
-   <collector service="Windows-Exporter" class-name="org.opennms.netmgt.collectd.prometheus.PrometheusCollector" />
-   <collector service="Node-Exporter" class-name="org.opennms.netmgt.collectd.prometheus.PrometheusCollector" />
-   <collector service="Elasticsearch" class-name="org.opennms.protocols.xml.collector.XmlCollector" />
-   <collector service="PostgreSQL" class-name="org.opennms.netmgt.collectd.JdbcCollector" />
+   <!-- delta-v collectd is SNMP-only by design: daemon-boot-collectd/pom.xml bundles
+        SnmpCollector and no other concrete collector. Daemon self-metrics and exporter
+        scrapes (JMX, JDBC, Prometheus node/windows exporters, Elasticsearch, WS-Man)
+        do NOT run through collectd — they flow via /actuator/prometheus -> Kafka ->
+        VictoriaMetrics. Only register a <collector> whose class is actually bundled in
+        the collectd image, or collectd will log "class ... not available" and skip it.
+        The JMX-Cassandra entries below are the last non-SNMP holdover and are retired
+        separately on the chore/collectd-rrd-amputation branch, not here. -->
    <collector service="SNMP" class-name="org.opennms.netmgt.collectd.SnmpCollector" />
-   <collector service="WMI" class-name="org.opennms.netmgt.collectd.WmiCollector" />
-   <collector service="WS-Man" class-name="org.opennms.netmgt.collectd.WsManCollector" />
-   <collector service="VMware-VirtualMachine" class-name="org.opennms.netmgt.collectd.VmwareCollector" />
-   <collector service="VMware-HostSystem" class-name="org.opennms.netmgt.collectd.VmwareCollector" />
-   <collector service="VMwareCim-HostSystem" class-name="org.opennms.netmgt.collectd.VmwareCimCollector" />
-   <collector service="OpenNMS-JVM" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
-   <collector service="JMX-Minion" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
    <collector service="JMX-Cassandra" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
    <collector service="JMX-Cassandra-Newts" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
-   <collector service="JMX-Kafka" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
-   <collector service="OpenNMS-DB" class-name="org.opennms.netmgt.collectd.JdbcCollector" />
-   <collector service="OpenNMS-DB-Stats" class-name="org.opennms.netmgt.collectd.JdbcCollector" />
 </collectd-configuration>
diff --git a/deploy/overlays/collectd/etc/datacollection-config.xml b/deploy/overlays/collectd/etc/datacollection-config.xml
index 8eab1f18f1fa..0dc3b3413e8b 100644
--- a/deploy/overlays/collectd/etc/datacollection-config.xml
+++ b/deploy/overlays/collectd/etc/datacollection-config.xml
@@ -80,10 +80,6 @@
       <include-collection dataCollectionGroup="Sonicwall"/>
       <include-collection dataCollectionGroup="SUN Microsystems"/>
       <include-collection dataCollectionGroup="Trango"/>
-      <include-collection dataCollectionGroup="VMware-Cim"/>
-      <include-collection dataCollectionGroup="VMware6"/>
-      <include-collection dataCollectionGroup="VMware7"/>
-      <include-collection dataCollectionGroup="WMI"/>
       <include-collection dataCollectionGroup="Zertico"/>
       <include-collection dataCollectionGroup="Zeus"/>
    </snmp-collection>
diff --git a/deploy/overlays/collectd/etc/datacollection/vmware-cim.xml b/deploy/overlays/collectd/etc/datacollection/vmware-cim.xml
deleted file mode 100644
index 1cf134950e4a..000000000000
--- a/deploy/overlays/collectd/etc/datacollection/vmware-cim.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<datacollection-group xmlns="http://xmlns.opennms.org/xsd/config/datacollection" name="VMware-Cim">
-   <resourceType name="SensorUnknown" label="VMware Sensor Unknown" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorOther" label="VMware Sensor Other" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorTemperature" label="VMware Sensor Temperature" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorVoltage" label="VMware Sensor Voltage" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorCurrent" label="VMware Sensor Current" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorCounter" label="VMware Sensor Counter" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorTachometer" label="VMware Sensor Tachometer" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorSwitch" label="VMware Sensor Switch" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorLock" label="VMware Sensor Lock" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorHumidity" label="VMware Sensor Humidity" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorSmokeDetection" label="VMware Sensor Smoke Detection" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorPresence" label="VMware Sensor Presence" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorAirFlow" label="VMware Sensor Air Flow" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorPowerConsumption" label="VMware Sensor Power Consumption" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorPowerProduction" label="VMware Sensor Power Production" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="SensorPressure" label="VMware Sensor Pressure" resourceLabel="${SensorName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-</datacollection-group>
\ No newline at end of file
diff --git a/deploy/overlays/collectd/etc/datacollection/vmware6.xml b/deploy/overlays/collectd/etc/datacollection/vmware6.xml
deleted file mode 100644
index fc9d4510a748..000000000000
--- a/deploy/overlays/collectd/etc/datacollection/vmware6.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<datacollection-group xmlns="http://xmlns.opennms.org/xsd/config/datacollection" name="VMware6">
-   <!--
-      Configuration file generated for:
-
-      Full name.......: VMware vCenter Server 6.0.0 build-3339084
-      API type........: VirtualCenter
-      API version.....: 6.0
-      Product name....: VMware VirtualCenter Server
-      Product version.: 6.0
-      OS type.........: linux-x64
-   -->
-   <resourceType name="vmware6Cpu" label="VMware v6 Cpu" resourceLabel="${vmware6CpuName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="vmware6DaSt" label="VMware v6 DaSt" resourceLabel="${vmware6DaStName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="vmware6Disk" label="VMware v6 Disk" resourceLabel="${vmware6DiskName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="vmware6Net" label="VMware v6 Net" resourceLabel="${vmware6NetName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="vmware6StAdptr" label="VMware v6 StAdptr" resourceLabel="${vmware6StAdptrName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="vmware6StPth" label="VMware v6 StPth" resourceLabel="${vmware6StPthName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="vmware6Sys" label="VMware v6 Sys" resourceLabel="${vmware6SysName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="vmware6VrtDisk" label="VMware v6 VrtDisk" resourceLabel="${vmware6VrtDiskName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="vmware6vflashModule" label="VMware v6 vflashModule" resourceLabel="${vmware6vflashModuleName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-</datacollection-group>
diff --git a/deploy/overlays/collectd/etc/datacollection/vmware7.xml b/deploy/overlays/collectd/etc/datacollection/vmware7.xml
deleted file mode 100644
index db96130c1e99..000000000000
--- a/deploy/overlays/collectd/etc/datacollection/vmware7.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Configuration file generated for:
-
-Full name.......: VMware vCenter Server 7.0.3 build-18901211
-API type........: VirtualCenter
-API version.....: 7.0.3.0
-Product name....: VMware VirtualCenter Server
-Product version.: 7.0
-OS type.........: linux-x64
--->
-
-<datacollection-group name="VMware7">
-
-  <resourceType name="vmware7Cpu" label="VMware v7 Cpu" resourceLabel="${vmware7CpuName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-  <resourceType name="vmware7DaSt" label="VMware v7 DaSt" resourceLabel="${vmware7DaStName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-  <resourceType name="vmware7Disk" label="VMware v7 Disk" resourceLabel="${vmware7DiskName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-  <resourceType name="vmware7Mem" label="VMware v7 Mem" resourceLabel="${vmware7MemName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-  <resourceType name="vmware7Net" label="VMware v7 Net" resourceLabel="${vmware7NetName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-  <resourceType name="vmware7StAdptr" label="VMware v7 StAdptr" resourceLabel="${vmware7StAdptrName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-  <resourceType name="vmware7StPth" label="VMware v7 StPth" resourceLabel="${vmware7StPthName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-  <resourceType name="vmware7Sys" label="VMware v7 Sys" resourceLabel="${vmware7SysName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-  <resourceType name="vmware7VrtDisk" label="VMware v7 VrtDisk" resourceLabel="${vmware7VrtDiskName}">
-    <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-    <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-  </resourceType>
-
-</datacollection-group>
\ No newline at end of file
diff --git a/deploy/overlays/collectd/etc/datacollection/wmi.xml b/deploy/overlays/collectd/etc/datacollection/wmi.xml
deleted file mode 100644
index 844612391d6b..000000000000
--- a/deploy/overlays/collectd/etc/datacollection/wmi.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<datacollection-group xmlns="http://xmlns.opennms.org/xsd/config/datacollection" name="WMI">
-   <resourceType name="wmiTcpipNetworkInterface" label="Windows TCP/IP Network Interface" resourceLabel="${wmiIpNetIfName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="wmiOSCpu" label="Windows Processor" resourceLabel="CPU ${wmiOSCpuName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="wmiPhysicalDisk" label="Windows Physical Disk" resourceLabel="${wmiPDName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="wmiLogicalDisk" label="Windows Logical Disk" resourceLabel="${wmiLDName}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-   <resourceType name="wmiW3" label="Windows Web Requests" resourceLabel="${wmiW3Name}">
-      <persistenceSelectorStrategy class="org.opennms.netmgt.collection.support.PersistAllSelectorStrategy"/>
-      <storageStrategy class="org.opennms.netmgt.collection.support.IndexStorageStrategy"/>
-   </resourceType>
-</datacollection-group>
\ No newline at end of file
diff --git a/deploy/overlays/shared/poller-services.yaml b/deploy/overlays/shared/poller-services.yaml
index 6de6fe72a68b..57bd317df067 100644
--- a/deploy/overlays/shared/poller-services.yaml
+++ b/deploy/overlays/shared/poller-services.yaml
@@ -184,11 +184,6 @@ services:
     parameters:
       service-name: "${requisition:service-name|detector:service-name|Task Scheduler}"
 
-  # NOTE: VMware monitors (VmwareCimMonitor / VmwareMonitor) are intentionally absent.
-  # delta-v does not bundle the vmware integration module, so those classes are not on
-  # the classpath and cannot be polled. If VMware support is ever added, reintroduce the
-  # module and the catalog entries together.
-
   - name: MS-RDP
     monitor: org.opennms.netmgt.poller.monitors.TcpMonitor
     interval: 300000