diff --git a/ci.fmf b/ci.fmf
index 24f8837..1418a0c 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1,2 +1,5 @@
----
-resultsdb-testcase: separate
+/gating:
+  plan:
+    import:
+      name: /plans/gating
+      url: https://gitlab.com/redhat/centos-stream/tests/grafana.git
diff --git a/gating.yaml b/gating.yaml
index 116ac6c..282e16b 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,4 +4,4 @@ product_versions:
 decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/gating.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
diff --git a/grafana.spec b/grafana.spec
index e3cc772..c2867b0 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -19,13 +19,14 @@
 end}
 
 %global gomodulesmode GO111MODULE=auto
-%global gotestflags   %{gotestflags} -tags=integration
+%global _gotestflags_save %{?gotestflags}
+%global gotestflags %{?_gotestflags_save} -tags=integration
 
 %global selinux_variants mls targeted
 
 Name:             grafana
 Version:          10.2.6
-Release:          17%{?dist}
+Release:          22%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          AGPL-3.0-only
 URL:              https://grafana.org
@@ -1025,6 +1026,21 @@ done
 %ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/*/active/modules/200/grafana
 
 %changelog
+* Wed Dec 3 2025 Sam Feifer <sfeifer@redhat.com> - 10.2.6-22
+- Fix recursive macro definition causing rpminspect failure
+
+* Tue Dec 2 2025 Sam Feifer <sfeifer@redhat.com> - 10.2.6-21
+- Fix grafana-selinux cgroups denials
+
+* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 10.2.6-20
+- rebuild
+
+* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 10.2.6-19
+- Rebuild for golang-1.25.0
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.6-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Wed Jul 16 2025 Sam Feifer <sfeifer@redhat.com> - 10.2.6-17
 - Backport selinux policy changes
 - Backport selinux packaging changes in the spec file
diff --git a/grafana.te b/grafana.te
index 41f0cb3..a536e21 100644
--- a/grafana.te
+++ b/grafana.te
@@ -108,6 +108,16 @@ allow grafana_t self:unix_stream_socket connectto;
 
 allow grafana_t self:netlink_route_socket { create bind getattr nlmsg_read };
 
+optional_policy(`
+	require {
+		type cgroup_t;
+		class dir { search };
+		class file { open read };
+	}
+	allow grafana_t cgroup_t:dir search;
+	allow grafana_t cgroup_t:file { open read };
+')
+
 optional_policy(`
 	require {
 		type smtp_port_t;
diff --git a/plans/gating.fmf b/plans/gating.fmf
deleted file mode 100644
index 5b0d2a0..0000000
--- a/plans/gating.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: CI Gating Plan
-discover:
-    how: fmf
-    filter: tag:gating
-    url: https://src.fedoraproject.org/tests/grafana
-execute:
-    how: tmt