diff --git a/.github/workflows/container-fips-tests.yml b/.github/workflows/container-fips-tests.yml
deleted file mode 100644
index 2fb0ec04..00000000
--- a/.github/workflows/container-fips-tests.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-on:
-  issue_comment:
-    types:
-      - created
-jobs:
-  container-tests:
-    # This job only runs for '[test]' pull request comments by owner, member
-    name: "Container tests with FIPS enabled: ${{ matrix.version }} - ${{ matrix.os_test }}"
-    runs-on: ubuntu-latest
-    concurrency:
-      group: container-fips-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [ "3.0", "3.3" ]
-        os_test: [ "rhel9", "rhel10" ]
-        test_case: [ "container-fips" ]
-
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
-    steps:
-      - uses: sclorg/tfaga-wrapper@main
-        with:
-          os_test: ${{ matrix.os_test }}
-          version: ${{ matrix.version }}
-          test_case: ${{ matrix.test_case }}
-          public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
-          private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
diff --git a/.github/workflows/container-pytests.yml b/.github/workflows/container-pytests.yml
deleted file mode 100644
index 316751e4..00000000
--- a/.github/workflows/container-pytests.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-on:
-  issue_comment:
-    types:
-      - created
-jobs:
-  container-tests:
-    runs-on: ubuntu-latest
-    name: "Container PyTests: ${{ matrix.version }} - ${{ matrix.os_test }}"
-    concurrency:
-      group: container-pytest-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [ "2.5", "3.0", "3.3" ]
-        os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c10s" ]
-        test_case: [ "container-pytest" ]
-
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test-pytest]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
-    steps:
-      - uses: sclorg/tfaga-wrapper@main
-        with:
-          os_test: ${{ matrix.os_test }}
-          version: ${{ matrix.version }}
-          test_case: ${{ matrix.test_case }}
-          public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
-          private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
index 8b5d4cb7..91dbe185 100644
--- a/.github/workflows/container-tests.yml
+++ b/.github/workflows/container-tests.yml
@@ -3,28 +3,13 @@ on:
     types:
       - created
 jobs:
+  check-readme:
+    uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main"
   container-tests:
-    runs-on: ubuntu-latest
-    name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
-    concurrency:
-      group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [ "2.5", "3.0", "3.3" ]
-        os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c10s" ]
-        test_case: [ "container" ]
-
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
-    steps:
-      - uses: sclorg/tfaga-wrapper@main
-        with:
-          os_test: ${{ matrix.os_test }}
-          version: ${{ matrix.version }}
-          test_case: ${{ matrix.test_case }}
-          public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
-          private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
+    needs: check-readme
+    uses: "sclorg/ci-actions/.github/workflows/container-tests.yml@main"
+    with:
+      enabled-tests: '["container","container-pytest","openshift-4","openshift-pytest","container-fips"]'
+      versions: '[ "2.5", "3.0", "3.3" ]'
+      openshift-versions: '[ "2.5", "3.0", "3.3" ]'
+    secrets: inherit
diff --git a/.github/workflows/openshift-pytests.yml b/.github/workflows/openshift-pytests.yml
deleted file mode 100644
index 87804fd0..00000000
--- a/.github/workflows/openshift-pytests.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-on:
-  issue_comment:
-    types:
-      - created
-jobs:
-  check-imagestreams:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      statuses: write
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test-openshift-pytest]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
-    steps:
-      - uses: sclorg/ci-scripts/ocp-stream-generator@master
-        with:
-          ref: "refs/pull/${{ github.event.issue.number }}/head"
-
-  openshift-pytests:
-    name: "${{ matrix.test_case }} PyTests: ${{ matrix.version }} - ${{ matrix.os_test }}"
-    runs-on: ubuntu-latest
-    needs: check-imagestreams
-    concurrency:
-      group: ocp-pytest-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [ "2.5", "3.0", "3.3" ]
-        os_test: [ "rhel8", "rhel9", "rhel10" ]
-        test_case: [ "openshift-pytest" ]
-
-    steps:
-      - uses: sclorg/tfaga-wrapper@main
-        with:
-          os_test: ${{ matrix.os_test }}
-          version: ${{ matrix.version }}
-          test_case: ${{ matrix.test_case }}
-          public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
-          private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml
deleted file mode 100644
index 33394b45..00000000
--- a/.github/workflows/openshift-tests.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-on:
-  issue_comment:
-    types:
-      - created
-jobs:
-  check-imagestreams:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      statuses: write
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test-openshift]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
-    steps:
-      - uses: sclorg/ci-scripts/ocp-stream-generator@master
-        with:
-          ref: "refs/pull/${{ github.event.issue.number }}/head"
-
-  openshift-tests:
-    name: "${{ matrix.test_case }} tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
-    runs-on: ubuntu-latest
-    needs: check-imagestreams
-    concurrency:
-      group: ocp-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [ "2.5", "3.0", "3.3" ]
-        os_test: [ "rhel8", "rhel9", "rhel10" ]
-        test_case: [ "openshift-4" ]
-
-    steps:
-      - uses: sclorg/tfaga-wrapper@main
-        with:
-          os_test: ${{ matrix.os_test }}
-          version: ${{ matrix.version }}
-          test_case: ${{ matrix.test_case }}
-          public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
-          private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
diff --git a/README.md b/README.md
index 88771eb4..e6ee98be 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,6 @@ Ruby container images
 
 [![Build and push images to Quay.io registry](https://github.com/sclorg/s2i-ruby-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/s2i-ruby-container/actions/workflows/build-and-push.yml)
 
-Images available on Quay are:
-* Fedora [ruby-33](https://quay.io/repository/fedora/ruby-33)
-* CentOS Stream 10 [ruby-33-c10s](https://quay.io/repository/sclorg/ruby-33-c10s)
-
 This repository contains the source for building various versions of
 the Ruby application as a reproducible container image using
 [source-to-image](https://github.com/openshift/source-to-image).
@@ -18,19 +14,18 @@ official [OpenShift Documentation](https://docs.okd.io/latest/using_images/s2i_i
 
 Versions
 ---------------
-Ruby versions currently provided are:
-* [Ruby 2.5](2.5/README.md)
-* [Ruby 3.0](3.0/README.md)
-* [Ruby 3.3](3.3/README.md)
-
-RHEL versions currently supported are:
-* RHEL8
-* RHEL9
-* RHEL10
-
-CentOS Stream versions currently supported are:
-* CentOS Stream 9
-* CentOS Stream 10
+Currently supported versions are visible in the following table, expand an entry to see its container registry address.
+<!--
+Table start
+-->
+||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10|
+|:--|:--:|:--:|:--:|:--:|:--:|:--:|
+|2.5||||<details><summary>✓</summary>`registry.redhat.io/rhel8/ruby-25`</details>|||
+|3.0|||||<details><summary>✓</summary>`registry.redhat.io/rhel9/ruby-30`</details>||
+|3.3||<details><summary>✓</summary>`quay.io/sclorg/ruby-33-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/ruby-33`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/ruby-33`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/ruby-33`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/ruby-33`</details>|
+<!--
+Table end
+-->
 
 A Ruby 1.9 image can be built from [this third party repository](https://github.com/getupcloud/s2i-ruby/).
 It is not maintained by Red Hat nor is it part of the OpenShift project.