diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..41defcd
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1,7 @@
+summary: Upstreamed tier tests
+discover:
+    how: fmf
+    repository: https://gitlab.com/redhat-crypto/tests/libssh.git
+    filter: 'tier: 0,1,2,3'
+execute:
+    how: beakerlib
diff --git a/gating.yaml b/gating.yaml
index a78e2e6..18b8f49 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,3 +1,19 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
 --- !Policy
 product_versions:
   - rhel-9
diff --git a/gating.yml b/gating.yml
deleted file mode 100644
index 0bd5927..0000000
--- a/gating.yml
+++ /dev/null
@@ -1,14 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
diff --git a/libssh.spec b/libssh.spec
index 388d3a0..9a2eed1 100644
--- a/libssh.spec
+++ b/libssh.spec
@@ -1,6 +1,6 @@
 Name:           libssh
 Version:        0.9.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library implementing the SSH protocol
 License:        LGPLv2+
 URL:            http://www.libssh.org
@@ -126,6 +126,10 @@ popd
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_server.config
 
 %changelog
+* Thu Nov 11 2021 Stanislav Zidek <szidek@redhat.com> - 0.9.6-2
+- STI, FMF, and gating fixes
+  Resolves: rhbz#2022034
+
 * Tue Oct 05 2021 Norbert Pocs <npocs@redhat.com> - 0.9.6-1
 - Fix CVE-CVE-2021-3634 libssh: possible heap-based buffer
   overflow when rekeying
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index c23e7f9..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://gitlab.com/redhat-crypto/tests/libssh.git"
-      dest: "libssh"
-      fmf_filter: "tier: 0,1,2,3"