diff --git a/hyperv-daemons.spec b/hyperv-daemons.spec
index 75d0bb3..528fc5e 100644
--- a/hyperv-daemons.spec
+++ b/hyperv-daemons.spec
@@ -13,7 +13,7 @@
 
 Name:     hyperv-daemons
 Version:  0
-Release:  0.36%{?snapver}%{?dist}
+Release:  0.37%{?snapver}%{?dist}
 Summary:  Hyper-V daemons suite
 
 License:  GPLv2
@@ -246,6 +246,10 @@ fi
 %{_sbindir}/lsvmbus
 
 %changelog
+* Fri Jul 01 2022 Chris Patterson <cpatterson@microsoft.com> - 0-0.37.20190303git
+- Only start kvpd under Hyper-V
+- Minimize dependencies for kvpd to ensure it starts before cloud-init
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.36.20190303git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/hypervkvpd.service b/hypervkvpd.service
index 2053f11..40dff13 100644
--- a/hypervkvpd.service
+++ b/hypervkvpd.service
@@ -2,7 +2,9 @@
 Description=Hyper-V KVP daemon
 ConditionVirtualization=microsoft
 BindsTo=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
-After=network.target
+After=sys-devices-virtual-misc-vmbus\x21hv_kvp.device
+RequiresMountsFor=/var/lib/hyperv
+Before=cloud-init-local.service
 IgnoreOnIsolate=1
 
 [Service]