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/.gitignore b/.gitignore
index 18ed2f7..2c5004b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,9 @@
 /scap-security-guide-0.1.57.tar.bz2
 /scap-security-guide-0.1.58.tar.bz2
 /scap-security-guide-0.1.59.tar.bz2
+/scap-security-guide-0.1.60.tar.bz2
+/scap-security-guide-0.1.61.tar.bz2
+/scap-security-guide-0.1.62.tar.bz2
+/scap-security-guide-0.1.63.tar.bz2
+/scap-security-guide-0.1.64.tar.bz2
+/scap-security-guide-0.1.65.tar.bz2
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index b16b396..1d65cc1 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,17 +1,17 @@
 --- !Policy
 product_versions:
-    - fedora-*
+  - fedora-*
 decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
-    - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional}
 --- !Policy
 product_versions:
-    - fedora-*
+  - fedora-*
 decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-    - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional}
 --- !Policy
 product_versions:
   - rhel-*
diff --git a/plans/fedora_tests.fmf b/plans/fedora_tests.fmf
new file mode 100644
index 0000000..63d6437
--- /dev/null
+++ b/plans/fedora_tests.fmf
@@ -0,0 +1,6 @@
+summary: Run tests from scap-security-guide tests repository
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/scap-security-guide
+execute:
+    how: tmt
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 38f0412..382f415 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -4,7 +4,7 @@
 %global _vpath_builddir build
 
 Name:		scap-security-guide
-Version:	0.1.59
+Version:	0.1.65
 Release:	1%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 License:	BSD
@@ -12,8 +12,6 @@ URL:		https://github.com/ComplianceAsCode/content/
 Source0:	https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2
 BuildArch:	noarch
 
-Patch0:		scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch
-
 BuildRequires:	libxslt
 BuildRequires:	expat
 BuildRequires:	openscap-scanner >= 1.2.5
@@ -23,6 +21,7 @@ BuildRequires: /usr/bin/python3
 BuildRequires:	python%{python3_pkgversion}
 BuildRequires:	python%{python3_pkgversion}-jinja2
 BuildRequires:	python%{python3_pkgversion}-PyYAML
+BuildRequires:	python%{python3_pkgversion}-setuptools
 Requires:	xml-common, openscap-scanner >= 1.2.5
 
 %description
@@ -100,6 +99,30 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
 %endif
 
 %changelog
+* Tue Dec 06 2022 Marcus Burghardt <maburgha@redhat.com> - 0.1.65-1
+- Update to latest upstream SCAP-Security-Guide-0.1.65 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.65
+
+* Tue Oct 04 2022 Watson Sato <wsato@redhat.com> - 0.1.64-1
+- Update to latest upstream SCAP-Security-Guide-0.1.64 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.64
+
+* Mon Aug 01 2022 Watson Sato <wsato@redhat.com> - 0.1.63-1
+- Update to latest upstream SCAP-Security-Guide-0.1.63 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.63
+
+* Mon May 30 2022 Vojtech Polasek <vpolasek@redhat.com> - 0.1.62-1
+- Update to latest upstream SCAP-Security-Guide-0.1.62 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.62
+
+* Wed May 04 2022 Watson Sato <wsato@redhat.com> - 0.1.61-1
+- Update to latest upstream SCAP-Security-Guide-0.1.61 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.61
+
+* Fri Jan 28 2022 Watson Sato <wsato@redhat.com> - 0.1.60-1
+- Update to latest upstream SCAP-Security-Guide-0.1.60 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.60
+
 * Wed Dec 01 2021 Watson Sato <wsato@redhat.com> - 0.1.59-1
 - Update to latest upstream SCAP-Security-Guide-0.1.59 release:
   https://github.com/ComplianceAsCode/content/releases/tag/v0.1.59
diff --git a/sources b/sources
index 8cdca32..ece9ecf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scap-security-guide-0.1.59.tar.bz2) = 2a92e6835749137c1080f08d2120949dbfea01eedf5f29728beb84dae62f90fd81b8869337cffa738de90641e0f5efc58115d914dceb691b12b805af2ad2de04
+SHA512 (scap-security-guide-0.1.65.tar.bz2) = 8c0f7431da33d80878d37cecff6afd55cfc3cc4085e987a5b0d5cecc8969373afa24c409d25bbe6de5ce1b6a718ed0d8c685a029ec7fec0c0de7d66f5040ad16
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 1546340..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/scap-security-guide.git"
-      dest: "scap-security-guide"
-      fmf_filter: "tier: 1, 2"