diff --git a/deploy-and-test.yml b/deploy-and-test.yml
index e75c47e..11485dd 100644
--- a/deploy-and-test.yml
+++ b/deploy-and-test.yml
@@ -94,6 +94,7 @@
         - rhel9-httpd-ex
         - rhel9-mariadb-105-container
         - rhel9-mariadb-1011-container
+        - rhel9-mariadb-118-container
         - rhel9-mysql-80-container
         - rhel9-nginx-ex-122
         - rhel9-nginx-ex-124
@@ -106,12 +107,15 @@
         - rhel9-postgresql-13-container
         - rhel9-postgresql-15-container
         - rhel9-postgresql-16-container
+        - rhel9-postgresql-18-container
         - rhel9-s2i-perl-532-container
         - rhel9-s2i-python-39-container
         - rhel9-s2i-python-311-container
         - rhel9-s2i-python-312-container
+        - rhel9-s2i-python-314-container
         - rhel9-s2i-ruby-30-container
         - rhel9-s2i-ruby-33-container
+        - rhel9-s2i-ruby-40-container
         - rhel9-cakephp-ex-83
         - rhel9-valkey-8
         - rhel10-httpd-ex
@@ -120,10 +124,13 @@
         - rhel10-nodejs-ex-24
         - rhel10-nodejs-ex-24-minimal
         - rhel10-mariadb-1011-container
+        - rhel10-mariadb-118-container
         - rhel10-mysql-84-container
         - rhel10-s2i-ruby-33-container
         - rhel10-s2i-python-312-minimal-container
+        - rhel10-s2i-python-314-minimal-container
         - rhel10-postgresql-16-container
+        - rhel10-postgresql-18-container
         - rhel10-s2i-perl-540-container
         - rhel10-valkey-8
         - rhel10-nginx-ex-126
@@ -146,17 +153,21 @@
         - rhel9-httpd-ex
         - rhel9-mariadb-105-container
         - rhel9-mariadb-1011-container
+        - rhel9-mariadb-118-container
         - rhel9-mysql-80-container
         - rhel9-nginx-ex-122
         - rhel9-nginx-ex-124
         - rhel9-postgresql-13-container
         - rhel9-postgresql-15-container
         - rhel9-postgresql-16-container
+        - rhel9-postgresql-18-container
         - rhel9-valkey-8
         - rhel10-httpd-ex
         - rhel10-mariadb-1011-container
+        - rhel10-mariadb-118-container
         - rhel10-mysql-84-container
         - rhel10-postgresql-16-container
+        - rhel10-postgresql-18-container
         - rhel10-valkey-8
         - rhel10-nginx-ex-126
       when: (github_repo == "") and (ext_test is defined) and (ext_test == "nos2i")
@@ -188,14 +199,17 @@
         - rhel9-s2i-python-39-container
         - rhel9-s2i-python-311-container
         - rhel9-s2i-python-312-container
+        - rhel9-s2i-python-314-container
         - rhel9-s2i-ruby-30-container
         - rhel9-s2i-ruby-33-container
+        - rhel9-s2i-ruby-40-container
         - rhel10-nodejs-ex-22
         - rhel10-nodejs-ex-22-minimal
         - rhel10-nodejs-ex-24
         - rhel10-nodejs-ex-24-minimal
         - rhel10-s2i-ruby-33-container
         - rhel10-s2i-python-312-minimal-container
+        - rhel10-s2i-python-314-minimal-container
         - rhel10-s2i-perl-540-container
         - rhel10-cakephp-ex-83
       when: (github_repo == "") and (ext_test is defined) and (ext_test == "s2i")
diff --git a/vars/rhel10-mariadb-118-container.yml b/vars/rhel10-mariadb-118-container.yml
new file mode 100644
index 0000000..0783284
--- /dev/null
+++ b/vars/rhel10-mariadb-118-container.yml
@@ -0,0 +1,13 @@
+registry_redhat_io: "rhel10/mariadb-118"
+tag_name: "mariadb:11.8-el10"
+deployment: "oc process -f https://raw.githubusercontent.com/sclorg/mariadb-container/master/examples/mariadb-persistent-template.json -p MARIADB_VERSION=11.8-el10 -p NAMESPACE={{ oc_project_rhscl }} \
+    -p DATABASE_SERVICE_NAME=mariadb-11.8 \
+	-p MYSQL_DATABASE=opdb \
+	-p MYSQL_USER=user \
+	-p MYSQL_PASSWORD=pass | oc apply -f -"
+pod_name: "mariadb-118"
+add_route: true
+test_exec_command: "./files/check_mariadb_container.sh"
+expected_exec_result: "FINE"
+scl_url: "mariadb-container"
+is_name: "mariadb"
diff --git a/vars/rhel10-postgresql-18-container.yml b/vars/rhel10-postgresql-18-container.yml
new file mode 100644
index 0000000..f91a00d
--- /dev/null
+++ b/vars/rhel10-postgresql-18-container.yml
@@ -0,0 +1,13 @@
+registry_redhat_io: "rhel10/postgresql-18"
+tag_name: "postgresql:18-el10"
+deployment: "oc process -f https://raw.githubusercontent.com/sclorg/postgresql-container/master/examples/postgresql-persistent-template.json -p POSTGRESQL_VERSION=18-el10 -p NAMESPACE={{ oc_project_rhscl }} \
+    -p DATABASE_SERVICE_NAME=postgresql-18 \
+	-p POSTGRESQL_DATABASE=opdb \
+	-p POSTGRESQL_USER=user \
+	-p POSTGRESQL_PASSWORD=pass | oc apply -f -"
+pod_name: "postgresql-18"
+add_route: true
+test_exec_command: "./files/check_postgresql_container.sh"
+expected_exec_result: "FINE"
+scl_url: "postgresql-container"
+is_name: "postgresql"
diff --git a/vars/rhel10-s2i-python-314-minimal-container.yml b/vars/rhel10-s2i-python-314-minimal-container.yml
new file mode 100644
index 0000000..d2ad446
--- /dev/null
+++ b/vars/rhel10-s2i-python-314-minimal-container.yml
@@ -0,0 +1,8 @@
+registry_redhat_io: "ubi10/python-314-minimal"
+tag_name: "python:3.14-ubi10"
+deployment: "oc new-app python:3.14-ubi10~https://github.com/sclorg/s2i-python-container.git --context-dir=3.14-minimal/test/setup-test-app/"
+pod_name: "s2i-python-container"
+add_route: true
+check_curl_output: "Hello from gunicorn WSGI application"
+scl_url: "s2i-python-container"
+is_name: "python"
diff --git a/vars/rhel10-s2i-ruby-40-container.yml b/vars/rhel10-s2i-ruby-40-container.yml
new file mode 100644
index 0000000..98bb166
--- /dev/null
+++ b/vars/rhel10-s2i-ruby-40-container.yml
@@ -0,0 +1,8 @@
+registry_redhat_io: "ubi10/ruby-40"
+tag_name: "ruby:4.0-ubi10"
+deployment: "oc new-app ruby:4.0-ubi10~https://github.com/sclorg/s2i-ruby-container.git --context-dir=4.0/test/puma-test-app/"
+pod_name: "s2i-ruby-container"
+add_route: true
+check_curl_output: "Hello world"
+scl_url: "s2i-ruby-container"
+is_name: "ruby"
diff --git a/vars/rhel9-mariadb-118-container.yml b/vars/rhel9-mariadb-118-container.yml
new file mode 100644
index 0000000..2c25a9d
--- /dev/null
+++ b/vars/rhel9-mariadb-118-container.yml
@@ -0,0 +1,13 @@
+registry_redhat_io: "rhel9/mariadb-118"
+tag_name: "mariadb:11.8-el9"
+deployment: "oc process -f https://raw.githubusercontent.com/sclorg/mariadb-container/master/examples/mariadb-persistent-template.json -p MARIADB_VERSION=11.8-el9 -p NAMESPACE={{ oc_project_rhscl }} \
+    -p DATABASE_SERVICE_NAME=mariadb-118 \
+	-p MYSQL_DATABASE=opdb \
+	-p MYSQL_USER=user \
+	-p MYSQL_PASSWORD=pass | oc apply -f -"
+pod_name: "mariadb-118"
+add_route: true
+test_exec_command: "./files/check_mariadb_container.sh"
+expected_exec_result: "FINE"
+scl_url: "mariadb-container"
+is_name: "mariadb"
diff --git a/vars/rhel9-postgresql-18-container.yml b/vars/rhel9-postgresql-18-container.yml
new file mode 100644
index 0000000..d1f5bc2
--- /dev/null
+++ b/vars/rhel9-postgresql-18-container.yml
@@ -0,0 +1,13 @@
+registry_redhat_io: "rhel9/postgresql-18"
+tag_name: "postgresql:18-el9"
+deployment: "oc process -f https://raw.githubusercontent.com/sclorg/postgresql-container/master/examples/postgresql-persistent-template.json -p POSTGRESQL_VERSION=18-el9 -p NAMESPACE={{ oc_project_rhscl }} \
+    -p DATABASE_SERVICE_NAME=postgresql-18 \
+	-p POSTGRESQL_DATABASE=opdb \
+	-p POSTGRESQL_USER=user \
+	-p POSTGRESQL_PASSWORD=pass | oc apply -f -"
+pod_name: "postgresql-18"
+add_route: true
+test_exec_command: "./files/check_postgresql_container.sh"
+expected_exec_result: "FINE"
+scl_url: "postgresql-container"
+is_name: "postgresql"
diff --git a/vars/rhel9-s2i-python-314-container.yml b/vars/rhel9-s2i-python-314-container.yml
new file mode 100644
index 0000000..4cb5159
--- /dev/null
+++ b/vars/rhel9-s2i-python-314-container.yml
@@ -0,0 +1,8 @@
+registry_redhat_io: "rhel9/python-314"
+tag_name: "python:3.14-el9"
+deployment: "oc new-app python:3.14-el9~https://github.com/sclorg/s2i-python-container.git --context-dir=3.14/test/setup-test-app/"
+pod_name: "s2i-python-container"
+add_route: true
+check_curl_output: "Hello from gunicorn WSGI application"
+scl_url: "s2i-python-container"
+is_name: "python"
diff --git a/vars/rhel9-s2i-ruby-40-container.yml b/vars/rhel9-s2i-ruby-40-container.yml
new file mode 100644
index 0000000..4af1259
--- /dev/null
+++ b/vars/rhel9-s2i-ruby-40-container.yml
@@ -0,0 +1,8 @@
+registry_redhat_io: "ubi9/ruby-40"
+tag_name: "ruby:4.0-ubi9"
+deployment: "oc new-app ruby:4.0-ubi9~https://github.com/sclorg/s2i-ruby-container.git --context-dir=4.0/test/puma-test-app/"
+pod_name: "s2i-ruby-container"
+add_route: true
+check_curl_output: "Hello world"
+scl_url: "s2i-ruby-container"
+is_name: "ruby"