diff --git a/SOURCES/hpvd-Use-filename-for-connection-profile.patch b/SOURCES/hpvd-Use-filename-for-connection-profile.patch
new file mode 100644
index 0000000..a73ec4f
--- /dev/null
+++ b/SOURCES/hpvd-Use-filename-for-connection-profile.patch
@@ -0,0 +1,36 @@
+From c04d9b584862ee913720632d7fdf83b79525a7d3 Mon Sep 17 00:00:00 2001
+From: Till Maas <timaas@redhat.com>
+Date: Tue, 14 Dec 2021 08:07:40 +0000
+Subject: [PATCH 2/2] Use filename for connection profile
+
+RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-MergeRequest: 2: hv_set_ifconfig.sh: Use nmcli commands
+RH-Commit: [2/2] 1b69f98b9c30ee6904475b78f2b93fabe2131074
+RH-Bugzilla: 2056566
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2056566
+
+Signed-off-by: Till Maas <tmaas@redhat.com>
+Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
+---
+ hv_set_ifconfig.sh | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
+index 5a64efe..146829b 100644
+--- a/hv_set_ifconfig.sh
++++ b/hv_set_ifconfig.sh
+@@ -57,5 +57,6 @@ echo "ONBOOT=yes" >> $1
+
+ cp $1 /etc/sysconfig/network-scripts/
+
+-nmcli connection load "/etc/sysconfig/network-scripts/$1"
+-nmcli connection up filename "/etc/sysconfig/network-scripts/$1"
++filename="${1##*/}"
++nmcli connection load "/etc/sysconfig/network-scripts/${filename}"
++nmcli connection up filename "/etc/sysconfig/network-scripts/${filename}"
+--
+2.27.0
+
diff --git a/SOURCES/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch b/SOURCES/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch
new file mode 100644
index 0000000..2b6a10b
--- /dev/null
+++ b/SOURCES/hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch
@@ -0,0 +1,41 @@
+From 2db75ec41c2e346af992f9c00f2e90ed9fec694b Mon Sep 17 00:00:00 2001
+From: Till Maas <timaas@redhat.com>
+Date: Mon, 13 Dec 2021 16:08:42 +0000
+Subject: [PATCH 1/2] hv_set_ifconfig.sh: Use nmcli commands
+
+RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-MergeRequest: 2: hv_set_ifconfig.sh: Use nmcli commands
+RH-Commit: [1/2] c045f4c849a7d8841c8ad4b6e4ba63abfb946187
+RH-Bugzilla: 2056566
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2056566
+
+Instead of using deprecated ifup/ifdown commands, use nmcli commands.
+Taking the connection down is not necessary with NM, so don't do it.
+
+Signed-off-by: Till Maas <tmaas@redhat.com>
+Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
+---
+ hv_set_ifconfig.sh | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/hv_set_ifconfig.sh b/hv_set_ifconfig.sh
+index 3dd064c..5a64efe 100644
+--- a/hv_set_ifconfig.sh
++++ b/hv_set_ifconfig.sh
+@@ -57,8 +57,5 @@ echo "ONBOOT=yes" >> $1
+
+ cp $1 /etc/sysconfig/network-scripts/
+
+-
+-interface=$(echo $1 | awk -F - '{ print $2 }')
+-
+-/sbin/ifdown $interface 2>/dev/null
+-/sbin/ifup $interface 2>/dev/null
++nmcli connection load "/etc/sysconfig/network-scripts/$1"
++nmcli connection up filename "/etc/sysconfig/network-scripts/$1"
+--
+2.27.0
+
diff --git a/SPECS/hyperv-daemons.spec b/SPECS/hyperv-daemons.spec
index 95c1b20..4c55cd2 100644
--- a/SPECS/hyperv-daemons.spec
+++ b/SPECS/hyperv-daemons.spec
@@ -13,7 +13,7 @@
Name: hyperv-daemons
Version: 0
-Release: 0.31%{?snapver}%{?dist}
+Release: 1.31%{?snapver}%{?dist}
Summary: Hyper-V daemons suite
Group: System Environment/Daemons
@@ -58,6 +58,10 @@ Patch3: hvd-Update-C-files-and-scripts-to-kernel-version-5.7-rc1.patch
Patch4: hvd-Add-vmbus_testing-tool-build-files.patch
# For bz#1886104 - [Hyper-V][RHEL8.4] Update Hyper-V-Daemons
Patch5: hvd-tools-hv-change-http-to-https-in-hv_kvp_daemon.c.patch
+# For bz#2056566 - [RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8
+Patch6: hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch
+# For bz#2056566 - [RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8
+Patch7: hpvd-Use-filename-for-connection-profile.patch
# For bz#2020141 - [Hyper-V][RHEL8.6][ARM64] No hyperv-daemons package built for aarch64 platform
# Patch6: hpvd-Enable-build-on-aarch64.patch
@@ -170,6 +174,8 @@ cp -pvL %{SOURCE4} hv_set_ifconfig.sh
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%build
# HYPERV KVP DAEMON
@@ -287,6 +293,12 @@ fi
%{_sbindir}/vmbus_testing
%changelog
+* Tue Mar 22 2022 Jon Maloy <jmaloy@redhat.com> - 0-1.31.20180415git
+- hpvd-hv_set_ifconfig.sh-Use-nmcli-commands.patch [bz#2056566]
+- hpvd-Use-filename-for-connection-profile.patch [bz#2056566]
+- Resolves: bz#2056566
+ ([RHEL8.6][Hyper-V]The /usr/libexec/hypervkvpd/hv_set_ifconfig need update since the ifdown/ifup was not supported on RHEL8)
+
* Wed Nov 10 2021 Jon Maloy <jmaloy@redhat.com> - 0-0.31.20180415git.el8
- hpvd-Enable-build-on-aarch64.patch [bz#2020141]
- Resolves: bz#2020141