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 3ccba0a..ef0472f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,7 @@
 --- !Policy
 product_versions:
-  - rhel-*
+  - rhel-10
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/rhel-gating.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/centos-stream}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..fdc27b4
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,19 @@
+/rhel-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/mariadb55
+      name: /plans/versioned/mariadb11.8/gating
+
+/rhel-no-gating:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/mariadb55
+      name: /plans/versioned/mariadb11.8/no-gating
+
+/centos-stream:
+  environment:
+    BUILD_PACKAGE: mariadb11.8-server
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/mariadb
+      name: /plans/versioned/base-package
diff --git a/tests/basic_service/PURPOSE b/tests/basic_service/PURPOSE
deleted file mode 100644
index 2f49e4c..0000000
--- a/tests/basic_service/PURPOSE
+++ /dev/null
@@ -1,3 +0,0 @@
-PURPOSE of basic_service
-Description: The very basic service testing
-Author: Michal Schorm <mschorm@redhat.com>
diff --git a/tests/basic_service/runtest.sh b/tests/basic_service/runtest.sh
deleted file mode 100755
index b6ec025..0000000
--- a/tests/basic_service/runtest.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of basic_service
-#   Description: The very basic service testing
-#   Author: Michal Schorm <mschorm@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $BUILD_PACKAGE
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "systemctl stop mariadb"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-
-
-    rlPhaseStartTest
-        rlRun "systemctl -q status mariadb" 3 "Test status of dead service"
-        rlRun "systemctl -q start mariadb" 0 "Start mariadb service"
-        rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "systemctl -q restart mariadb" 0 "Restart running mariadb service"
-        rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "systemctl -q stop mariadb" 0 "Stop mariadb service"
-        rlRun "systemctl -q status mariadb" 3 "Test status of dead mariadb service"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "systemctl -q start mariadb" 0 "Start mariadb service"
-        rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
-    rlPhaseEnd
-
-
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-rlGetTestState
-exit $ECODE
diff --git a/tests/main.fmf b/tests/main.fmf
deleted file mode 100644
index 003b008..0000000
--- a/tests/main.fmf
+++ /dev/null
@@ -1,29 +0,0 @@
-summary: Runs a few basic daemon tests
-prepare:
-    - 
-        how: install
-        package:
-            - beakerlib
-
-    -
-        how: shell
-        # checks whether this is a distribution default
-        # package and if not, gets it's name from the
-        # spec file name
-        script: |
-            SPEC_FILE=$(find . -maxdepth 2 -name "*.spec")
-            if grep -qP "mariadb_default\s+1" "$SPEC_FILE"; then
-            BUILD_PACKAGE=mariadb-server
-            else
-            BUILD_PACKAGE=mariadb$(echo "$SPEC_FILE" | grep -Po "\d+\.\d+")-server
-            fi
-            dnf install -y "$BUILD_PACKAGE"
-            # saves the package name for the excecute phase
-            echo "$BUILD_PACKAGE" > "$TMT_RUN_DIR/build_package.env"
-
-execute:
-    script: |
-        # reads and exports the package name
-        export BUILD_PACKAGE=$(cat "$TMT_RUN_DIR/build_package.env")
-        echo "Executing test with package: $BUILD_PACKAGE"
-        cd ./tests/basic_service/ && ./runtest.sh