diff --git a/.gitignore b/.gitignore
index 145d29e..d3a23d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,9 @@ SOURCES/ffi-1.13.1.gem
 SOURCES/json-2.3.0.gem
 SOURCES/mustermann-1.1.1.gem
 SOURCES/open4-1.3.4-1.gem
-SOURCES/pcs-0.10.8.210-9862.tar.gz
-SOURCES/pcs-web-ui-0.1.6.tar.gz
-SOURCES/pcs-web-ui-node-modules-0.1.6.tar.xz
+SOURCES/pcs-0.10.10.tar.gz
+SOURCES/pcs-web-ui-0.1.7.tar.gz
+SOURCES/pcs-web-ui-node-modules-0.1.7.tar.xz
 SOURCES/pyagentx-0.4.pcs.2.tar.gz
 SOURCES/python-dateutil-2.8.1.tar.gz
 SOURCES/rack-2.2.3.gem
diff --git a/.pcs.metadata b/.pcs.metadata
index 505c02b..6167c6c 100644
--- a/.pcs.metadata
+++ b/.pcs.metadata
@@ -9,9 +9,9 @@ cfa25e7a3760c3ec16723cb8263d9b7a52d0eadf SOURCES/ffi-1.13.1.gem
 0230e8c5a37f1543982e5b04be503dd5f9004b47 SOURCES/json-2.3.0.gem
 50a4e37904485810cb05e27d75c9783e5a8f3402 SOURCES/mustermann-1.1.1.gem
 41a7fe9f8e3e02da5ae76c821b89c5b376a97746 SOURCES/open4-1.3.4-1.gem
-cd01811967b4fa99aec5aefe71f8a88fc0f8c0e5 SOURCES/pcs-0.10.8.210-9862.tar.gz
-0d5a8c5f3c2888e19de1f7180401bbfcfd423e24 SOURCES/pcs-web-ui-0.1.6.tar.gz
-3d401b7048e51cb097c3b55c77492e76dde1d443 SOURCES/pcs-web-ui-node-modules-0.1.6.tar.xz
+a1c0585455b7e050c33598598a045ccd2776cb28 SOURCES/pcs-0.10.10.tar.gz
+b9ed12ca957c2f204ec37ea2836b924c36fab379 SOURCES/pcs-web-ui-0.1.7.tar.gz
+8824285e6f1c2807d9222d573c6e6df1e50d8410 SOURCES/pcs-web-ui-node-modules-0.1.7.tar.xz
 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz
 bd26127e57f83a10f656b62c46524c15aeb844dd SOURCES/python-dateutil-2.8.1.tar.gz
 345b7169d4d2d62176a225510399963bad62b68f SOURCES/rack-2.2.3.gem
diff --git a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch
index 0dbd5a3..7cb3da0 100644
--- a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch
+++ b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch
@@ -1,4 +1,4 @@
-From b7ea818c8926b35f6b4d5dfa4b7794d0ca4f6045 Mon Sep 17 00:00:00 2001
+From 891dc3d015d42b4f4b34f578f2ca8fd359b50017 Mon Sep 17 00:00:00 2001
 From: Ivan Devat <idevat@redhat.com>
 Date: Tue, 20 Nov 2018 15:03:56 +0100
 Subject: [PATCH] do not support cluster setup with udp(u) transport
@@ -10,10 +10,10 @@ Subject: [PATCH] do not support cluster setup with udp(u) transport
  3 files changed, 6 insertions(+)
 
 diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
-index f9b5014a..44ea8c71 100644
+index ac093d69..47ad57d6 100644
 --- a/pcs/pcs.8.in
 +++ b/pcs/pcs.8.in
-@@ -426,6 +426,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
+@@ -429,6 +429,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
  
  Transports udp and udpu:
  .br
@@ -23,10 +23,10 @@ index f9b5014a..44ea8c71 100644
  .br
  Transport options are: ip_version, netmtu
 diff --git a/pcs/usage.py b/pcs/usage.py
-index 2b967e6b..fc454c5a 100644
+index 38e21ed9..96e304ff 100644
 --- a/pcs/usage.py
 +++ b/pcs/usage.py
-@@ -863,6 +863,7 @@ Commands:
+@@ -872,6 +872,7 @@ Commands:
              hash=sha256. To disable encryption, set cipher=none and hash=none.
  
          Transports udp and udpu:
@@ -49,5 +49,5 @@ index 2f26e831..a7702ac4 100644
  #csetup-transport-options.knet .without-knet
  {
 -- 
-2.31.1
+2.27.0
 
diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec
index 607c245..000fdfa 100644
--- a/SPECS/pcs.spec
+++ b/SPECS/pcs.spec
@@ -1,6 +1,6 @@
 Name: pcs
-Version: 0.10.8
-Release: 4%{?dist}
+Version: 0.10.10
+Release: 1%{?dist}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPLv2: pcs
@@ -19,14 +19,14 @@ Summary: Pacemaker Configuration System
 #building only for architectures with pacemaker and corosync available
 ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 
-# %%global version_or_commit %%{version}
-%global version_or_commit %{version}.210-9862
+%global version_or_commit %{version}
+# %%global version_or_commit %%{version}.210-9862
 
 %global pcs_source_name %{name}-%{version_or_commit}
 
 # ui_commit can be determined by hash, tag or branch
-%global ui_commit 0.1.6
-%global ui_modules_version 0.1.6
+%global ui_commit 0.1.7
+%global ui_modules_version 0.1.7
 %global ui_src_name pcs-web-ui-%{ui_commit}
 
 %global pcs_snmp_pkg_name  pcs-snmp
@@ -565,6 +565,15 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Thu Aug 19 2021 Ondrej Mular <omular@redhat.com> - 0.10.10-1
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Updated pcs-web-ui
+- Resolves: rhbz#1885293 rhbz#1847102 rhbz#1935594
+
+* Tue Aug 10 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.9-1
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Resolves: rhbz#1432097 rhbz#1847102 rhbz#1935594 rhbz#1984901
+
 * Tue Jul 20 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.8-4
 - Rebased to latest upstream sources (see CHANGELOG.md)
 - Resolves: rhbz#1759995 rhbz#1872378 rhbz#1935594