diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..da04079
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1,2 @@
+resultsdb-testcase: separate
+
diff --git a/gating.yaml b/gating.yaml
index 4ca9235..0bd4969 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,4 +3,4 @@ product_versions:
   - rhel-10
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-gating.functional}
diff --git a/mysql8.4.spec b/mysql8.4.spec
index e31f129..afe01fd 100644
--- a/mysql8.4.spec
+++ b/mysql8.4.spec
@@ -2,7 +2,7 @@ ExcludeArch: %{ix86}
 
 # Name of the package without any prefixes
 %global majorname mysql
-%global package_version 8.4.6
+%global package_version 8.4.7
 %global majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
 %global pkgnamepatch mysql
 
@@ -21,7 +21,7 @@ ExcludeArch: %{ix86}
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
 # run only "main" suite
-%global last_tested_version 8.4.6
+%global last_tested_version 8.4.7
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -104,7 +104,7 @@ ExcludeArch: %{ix86}
 
 Name:             %{majorname}%{majorversion}
 Version:          %{package_version}
-Release:          2%{?with_debug:.debug}%{?dist}.alma.1
+Release:          1%{?with_debug:.debug}%{?dist}.alma.1
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -1133,9 +1133,12 @@ popd
 %endif
 
 %changelog
-* Thu Sep 04 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.6-2.alma.1
+* Tue Nov 25 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4.7-1.alma.1
 - Add riscv64 support
 
+* Thu Oct 30 2025 Pavol Sloboda <psloboda@redhat.com> - 8.4.7-1
+- Rebase to 8.4.7
+
 * Thu Jul 24 2025 Pavol Sloboda <psloboda@redhat.com> - 8.4.6-1
 - Rebase to 8.4.6
 
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..f6b8b17
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,10 @@
+/rhel-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/mysql
+      name: /plans/versioned/mysql84/gating
+/rhel-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/mysql
+      name: /plans/versioned/mysql84/no-gating
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 33ad904..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier1 tests plan
-discover:
-    how: fmf
-    filter: 'tier: 1'
-    url: https://pkgs.devel.redhat.com/git/tests/mysql
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
diff --git a/sources b/sources
index 458e60b..99a2f70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-8.4.6.tar.gz) = 2d498dc71eeede4368bd70fb1d1c012abd774732e341312f469afa3823c3b37489032b3290fa7531fb78c2b36251dbd1b8e1554c9330e18e56407f96fb8d4a1e
+SHA512 (mysql-8.4.7.tar.gz) = d9596395b176490d5e58be307c2f82f55c9acd3206c1ba29bdb8c96c67438bbe5594621f601161ccb77f56c8262d00255ab6fd8aa62db61c80a1721e3d4e45a2