diff --git a/.gitignore b/.gitignore
index 30b46f7..a82b644 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.11.22-9d83b.tar.gz
-SOURCES/pcs-web-ui-0.1.10.tar.gz
-SOURCES/pcs-web-ui-node-modules-0.1.10.tar.xz
+SOURCES/pcs-0.10.12.tar.gz
+SOURCES/pcs-web-ui-0.1.11.tar.gz
+SOURCES/pcs-web-ui-node-modules-0.1.11.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 143438c..b05821a 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
-52a13e75fcbc4cc8d69bdb26bf1b281649415e9d SOURCES/pcs-0.10.11.22-9d83b.tar.gz
-86002e7752f3db1aa5b98d29166c7bf9bbc6c2b5 SOURCES/pcs-web-ui-0.1.10.tar.gz
-14a0e8c5245dc34e8cc80663073e354c81c9e06c SOURCES/pcs-web-ui-node-modules-0.1.10.tar.xz
+1937b826a36bb8396da227361d13f4c25830929c SOURCES/pcs-0.10.12.tar.gz
+84f87804814a2f97aa9b9a33ca47f43fd6198097 SOURCES/pcs-web-ui-0.1.11.tar.gz
+769c4b1abe37b44673e92c90c29d32fe9240fbc1 SOURCES/pcs-web-ui-node-modules-0.1.11.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 a02f9a9..da9caf3 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 652e3fd4bcd895d6863ca9c867473558164d83d2 Mon Sep 17 00:00:00 2001
+From 3eb6016cedc5587a55c52ead9d2899f855e9c820 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 785c3d4f..9200f32a 100644
+index 05ee66db..101d66f7 100644
 --- a/pcs/pcs.8.in
 +++ b/pcs/pcs.8.in
-@@ -428,6 +428,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
+@@ -436,6 +436,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
  
  Transports udp and udpu:
  .br
@@ -23,10 +23,10 @@ index 785c3d4f..9200f32a 100644
  .br
  Transport options are: ip_version, netmtu
 diff --git a/pcs/usage.py b/pcs/usage.py
-index 8d8ce7fa..70fcf4b7 100644
+index 78bb5ee7..b6f3dd10 100644
 --- a/pcs/usage.py
 +++ b/pcs/usage.py
-@@ -870,6 +870,7 @@ Commands:
+@@ -890,6 +890,7 @@ Commands:
              hash=sha256. To disable encryption, set cipher=none and hash=none.
  
          Transports udp and udpu:
diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec
index 9f65d7e..a83d64f 100644
--- a/SPECS/pcs.spec
+++ b/SPECS/pcs.spec
@@ -1,6 +1,6 @@
 Name: pcs
-Version: 0.10.11
-Release: 2%{?dist}
+Version: 0.10.12
+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}.22-9d83b
+%global version_or_commit %{version}
+# %%global version_or_commit %%{version}.22-9d83b
 
 %global pcs_source_name %{name}-%{version_or_commit}
 
 # ui_commit can be determined by hash, tag or branch
-%global ui_commit 0.1.10
-%global ui_modules_version 0.1.10
+%global ui_commit 0.1.11
+%global ui_modules_version 0.1.11
 %global ui_src_name pcs-web-ui-%{ui_commit}
 
 %global pcs_snmp_pkg_name  pcs-snmp
@@ -357,7 +357,7 @@ cp -f %SOURCE45 rpm/
 %define debug_package %{nil}
 
 ./autogen.sh
-%{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3}
+%{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3} ruby_CFLAGS="%{optflags}" ruby_LIBS="%{build_ldflags}"
 make all
 
 # build pcs-web-ui
@@ -565,6 +565,11 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Thu Dec 02 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.12-1
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Updated pcs-web-ui
+- Resolves: rhbz#1552470 rhbz#1997011 rhbz#2017311 rhbz#2017312 rhbz#2024543 rhbz#2012128
+
 * Mon Nov 22 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.11-2
 - Rebased to latest upstream sources (see CHANGELOG.md)
 - Removed 'export PYTHONCOERCECLOCALE=0'