diff --git a/SOURCES/hypervkvpd.service b/SOURCES/hypervkvpd.service
index 36ee11c..40dff13 100644
--- a/SOURCES/hypervkvpd.service
+++ b/SOURCES/hypervkvpd.service
@@ -1,7 +1,10 @@
 [Unit]
 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]
diff --git a/SPECS/hyperv-daemons.spec b/SPECS/hyperv-daemons.spec
index c566a44..928780c 100644
--- a/SPECS/hyperv-daemons.spec
+++ b/SPECS/hyperv-daemons.spec
@@ -13,7 +13,7 @@
 
 Name:     hyperv-daemons
 Version:  0
-Release:  0.39%{?snapver}%{?dist}
+Release:  0.40%{?snapver}%{?dist}
 Summary:  Hyper-V daemons suite
 
 License:  GPLv2
@@ -52,6 +52,7 @@ Patch0006: 0006-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch
 Patch7: hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch
 # For bz#2026371 - [RHEL9][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update for RHEL9 since the ifdown/ifup was not supported on RHEL9
 Patch8: hpvd-Use-filename-for-connection-profile.patch
+
 # Source-git patches
 
 # Hyper-V is available only on x86 and aarch64 architectures
@@ -275,6 +276,11 @@ fi
 %{_sbindir}/vmbus_testing
 
 %changelog
+* Fri Jul 29 2022 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.40.20190303git
+- hpvd-hypervkvpd.service-ordering-fixes.patch [bz#2103188]
+- Resolves: bz#2103188
+  ([Hyper-V][RHEL-9] hypervkvpd.service service ordering)
+
 * Wed Dec 15 2021 Miroslav Rezanina <mrezanin@redhat.com> - 0-0.39.20190303git
 - hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch [bz#2026371]
 - hpvd-Use-filename-for-connection-profile.patch [bz#2026371]