diff --git a/ci.fmf b/ci.fmf
index 95aa67d..c5aa0e0 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1,8 +1 @@
-summary: Tier tests
-discover:
-    how: fmf
-    repository: https://src.fedoraproject.org/tests/postgresql.git
-    ref: main
-    filter: 'tag:libecpg'
-execute:
-    how: tmt
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..fc9bf58
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,17 @@
+# Branched Fedora (non-Rawhide)
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+
+# Rawhide Fedora
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
diff --git a/libecpg.spec b/libecpg.spec
index dd2a0dd..8b3c2eb 100644
--- a/libecpg.spec
+++ b/libecpg.spec
@@ -3,7 +3,7 @@
 Summary: ECPG - Embedded SQL in C
 Name: libecpg
 Version: %majorversion.4
-Release: 4%{?dist}
+Release: 7%{?dist}
 
 License: PostgreSQL
 Url: http://www.postgresql.org/
@@ -27,7 +27,7 @@ BuildRequires: krb5-devel
 BuildRequires: openldap-devel
 BuildRequires: libpq-devel
 BuildRequires: gettext
-BuildRequires: multilib-rpm-config
+%{!?rhel:BuildRequires: multilib-rpm-config}
 BuildRequires: make
 BuildRequires: libicu-devel
 
@@ -91,7 +91,9 @@ export CFLAGS="$CFLAGS -std=c17"
 # remove files not to be packaged
 find $RPM_BUILD_ROOT -name '*.a' -delete
 
+%if %{undefined rhel}
 %multilib_fix_c_header --file "%{_includedir}/ecpg_config.h"
+%endif
 
 # function from postgresql.spec
 find_lang_bins ()
@@ -133,6 +135,17 @@ find_lang_bins %name-devel.lst  ecpg
 
 
 %changelog
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 16.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 16.4-6
+- Rebuilt for openssl 4.0
+
+* Thu May 21 2026 Michal Schorm <mschorm@redhat.com> - 16.4-5
+- Drop multilib-rpm-config usage on RHEL
+  Related: RHEL-178013
+  Related: https://github.com/fedora-eln/eln/issues/525
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 16.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
new file mode 100644
index 0000000..89901bf
--- /dev/null
+++ b/plans/tier1-public.fmf
@@ -0,0 +1,5 @@
+/tier1-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/postgresql
+      name: /plans/versioned/postgresql18/libecpg