diff --git a/CI_plan.fmf b/CI_plan.fmf
new file mode 100644
index 0000000..823a336
--- /dev/null
+++ b/CI_plan.fmf
@@ -0,0 +1,38 @@
+/tier1-tests-on-x86_64-with-swtok:
+
+  summary: opencryptoki Tier1 tests on x86_64 with swtok
+
+  tag:
+   - Tier1
+
+  discover:
+    url: https://src.fedoraproject.org/tests/opencryptoki.git
+    filter: "tag:Tier1"
+    how: fmf
+    test:
+     - "Sanity/.*"
+     - "Regression/.*"
+
+  execute:
+    how: tmt
+
+/sw-token-package-update:
+
+  summary: perform opencryptoki package update on a configured SW token
+
+  prepare:
+   - how: shell
+     order: 90
+     script:
+      - dnf -y downgrade 'opencryptoki*'
+
+  discover:
+    url: https://src.fedoraproject.org/tests/opencryptoki.git
+    how: fmf
+    test:
+      - /Update/initialized-sw-token/setup
+      - /Update/dnf-update-opencryptoki
+      - /Update/initialized-sw-token/test
+
+  execute:
+    how: tmt
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..9d65c09
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.openstack-tier1.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.beaker-tier1.functional}
diff --git a/opencryptoki.spec b/opencryptoki.spec
index 903777c..2832e2b 100644
--- a/opencryptoki.spec
+++ b/opencryptoki.spec
@@ -1,7 +1,7 @@
 Name:			opencryptoki
 Summary:		Implementation of the PKCS#11 (Cryptoki) specification v3.0
 Version:		3.23.0
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		CPL-1.0
 URL:			https://github.com/opencryptoki/opencryptoki
 Source0:		https://github.com/opencryptoki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -348,6 +348,11 @@ fi
 
 
 %changelog
+* Tue Apr 16 2024 Than Ngo <than@redhat.com> - 3.23.0-2
+- enable gating tests
+
+Resolves: RHEL-24037, RHEL-24038
+
 * Wed Feb 07 2024 Than Ngo <than@redhat.com> - 3.23.0-1
 - 3.23.0
    * EP11: Add support for FIPS-session mode