diff --git a/charts/redhat/redhat-mariadb-imagestreams/src/Chart.yaml b/charts/redhat/redhat-mariadb-imagestreams/src/Chart.yaml
index 4de52cc..0dc2355 100644
--- a/charts/redhat/redhat-mariadb-imagestreams/src/Chart.yaml
+++ b/charts/redhat/redhat-mariadb-imagestreams/src/Chart.yaml
@@ -5,10 +5,10 @@ description: |-
 annotations:
   charts.openshift.io/name: Red Hat MariaDB database service imagestreams (experimental)
 apiVersion: v2
-appVersion: 0.0.3
+appVersion: 0.0.4
 kubeVersion: '>=1.20.0'
 name: redhat-mariadb-imagestreams
 tags: database,mariadb
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.3
+version: 0.0.4
diff --git a/charts/redhat/redhat-mariadb-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/redhat-mariadb-imagestreams/src/templates/imagestreams.yaml
index e83f6d1..f3b6f38 100644
--- a/charts/redhat/redhat-mariadb-imagestreams/src/templates/imagestreams.yaml
+++ b/charts/redhat/redhat-mariadb-imagestreams/src/templates/imagestreams.yaml
@@ -122,3 +122,35 @@ spec:
         name: 'registry.redhat.io/rhel10/mariadb-1011:latest'
       referencePolicy:
         type: Local
+    - name: 11.8-el9
+      annotations:
+        openshift.io/display-name: MariaDB 11.8 (RHEL 9)
+        openshift.io/provider-display-name: 'Red Hat, Inc.'
+        description: >-
+          Provides a MariaDB 11.8 database on RHEL 9. For more information about
+          using this database image, including OpenShift considerations, see
+          https://github.com/sclorg/mariadb-container/tree/master/11.8/README.md.
+        iconClass: icon-mariadb
+        tags: 'database,mariadb'
+        version: '11.8'
+      from:
+        kind: DockerImage
+        name: 'registry.redhat.io/rhel9/mariadb-118:latest'
+      referencePolicy:
+        type: Local
+    - name: 11.8-el10
+      annotations:
+        openshift.io/display-name: MariaDB 11.8 (RHEL 10)
+        openshift.io/provider-display-name: 'Red Hat, Inc.'
+        description: >-
+          Provides a MariaDB 11.8 database on RHEL 10. For more information about
+          using this database image, including OpenShift considerations, see
+          https://github.com/sclorg/mariadb-container/tree/master/11.8/README.md.
+        iconClass: icon-mariadb
+        tags: 'database,mariadb'
+        version: '11.8'
+      from:
+        kind: DockerImage
+        name: 'registry.redhat.io/rhel10/mariadb-118:latest'
+      referencePolicy:
+        type: Local
diff --git a/charts/redhat/redhat-mariadb-persistent/src/Chart.yaml b/charts/redhat/redhat-mariadb-persistent/src/Chart.yaml
index b8445dc..036a4a4 100644
--- a/charts/redhat/redhat-mariadb-persistent/src/Chart.yaml
+++ b/charts/redhat/redhat-mariadb-persistent/src/Chart.yaml
@@ -4,11 +4,11 @@ description: |-
   NOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.
 name: redhat-mariadb-persistent
 tags: database,mariadb
-version: 0.0.5
+version: 0.0.6
 kubeVersion: '>=1.20.0'
 annotations:
   charts.openshift.io/name: Red Hat MariaDB database service, with persistent storage (experimental)
 apiVersion: v2
-appVersion: 0.0.5
+appVersion: 0.0.6
 sources:
   - https://github.com/sclorg/helm-charts
diff --git a/charts/redhat/redhat-mariadb-persistent/src/values.schema.json b/charts/redhat/redhat-mariadb-persistent/src/values.schema.json
index ced7263..23d50ff 100644
--- a/charts/redhat/redhat-mariadb-persistent/src/values.schema.json
+++ b/charts/redhat/redhat-mariadb-persistent/src/values.schema.json
@@ -33,7 +33,7 @@
         "mariadb_version": {
             "type": "string",
             "description": "Specify mariadb imagestream tag",
-            "enum": [ "latest", "10.5-el9", "10.11-el9", "10.11-el10", "10.3-el8", "10.5-el8", "10.11-el8", "10.3" ]
+            "enum": [ "latest", "10.5-el9", "10.11-el9", "10.11-el10", "10.3-el8", "10.5-el8", "10.11-el8", "10.3", "11.8-el9", "11.8-el10"]
         },
         "pvc": {
             "type": "object",
diff --git a/charts/redhat/redhat-postgresql-imagestreams/src/Chart.yaml b/charts/redhat/redhat-postgresql-imagestreams/src/Chart.yaml
index c9301f5..9d49425 100644
--- a/charts/redhat/redhat-postgresql-imagestreams/src/Chart.yaml
+++ b/charts/redhat/redhat-postgresql-imagestreams/src/Chart.yaml
@@ -4,10 +4,10 @@ description: |-
 annotations:
   charts.openshift.io/name: Red Hat PostgreSQL database service imagestreams (experimental)
 apiVersion: v2
-appVersion: 0.0.5
+appVersion: 0.0.6
 kubeVersion: '>=1.20.0'
 name: redhat-postgresql-imagestreams
 tags: database,postgresql
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.5
+version: 0.0.6
diff --git a/charts/redhat/redhat-postgresql-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/redhat-postgresql-imagestreams/src/templates/imagestreams.yaml
index 11dad7d..0cb69f8 100644
--- a/charts/redhat/redhat-postgresql-imagestreams/src/templates/imagestreams.yaml
+++ b/charts/redhat/redhat-postgresql-imagestreams/src/templates/imagestreams.yaml
@@ -23,7 +23,41 @@ spec:
         tags: 'database,postgresql'
       from:
         kind: ImageStreamTag
-        name: 16-el9
+        name: 18-el10
+      referencePolicy:
+        type: Local
+    - name: 18-el10
+      annotations:
+        openshift.io/display-name: PostgreSQL 18 (RHEL 10)
+        openshift.io/provider-display-name: 'Red Hat, Inc.'
+        description: >-
+          Provides a PostgreSQL 18 database on RHEL 10. For more information
+          about using this database image, including OpenShift considerations,
+          see
+          https://github.com/sclorg/postgresql-container/blob/master/README.md.
+        iconClass: icon-postgresql
+        tags: 'database,postgresql'
+        version: '18'
+      from:
+        kind: DockerImage
+        name: 'registry.redhat.io/rhel10/postgresql-18:latest'
+      referencePolicy:
+        type: Local
+    - name: 18-el9
+      annotations:
+        openshift.io/display-name: PostgreSQL 18 (RHEL 9)
+        openshift.io/provider-display-name: 'Red Hat, Inc.'
+        description: >-
+          Provides a PostgreSQL 18 database on RHEL 9. For more information
+          about using this database image, including OpenShift considerations,
+          see
+          https://github.com/sclorg/postgresql-container/blob/master/README.md.
+        iconClass: icon-postgresql
+        tags: 'database,postgresql'
+        version: '18'
+      from:
+        kind: DockerImage
+        name: 'registry.redhat.io/rhel9/postgresql-18:latest'
       referencePolicy:
         type: Local
     - name: 16-el10
diff --git a/charts/redhat/redhat-postgresql-persistent/src/Chart.yaml b/charts/redhat/redhat-postgresql-persistent/src/Chart.yaml
index d244a06..72e5f81 100644
--- a/charts/redhat/redhat-postgresql-persistent/src/Chart.yaml
+++ b/charts/redhat/redhat-postgresql-persistent/src/Chart.yaml
@@ -5,10 +5,10 @@ description: |-
 annotations:
   charts.openshift.io/name: Red Hat PostgreSQL database service, with persistent storage (experimental)
 apiVersion: v2
-appVersion: 0.0.5
+appVersion: 0.0.6
 name: redhat-postgresql-persistent
 tags: database,postgresql
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.5
+version: 0.0.6
 
diff --git a/charts/redhat/redhat-postgresql-persistent/src/values.schema.json b/charts/redhat/redhat-postgresql-persistent/src/values.schema.json
index c2c5ad6..61b5e13 100644
--- a/charts/redhat/redhat-postgresql-persistent/src/values.schema.json
+++ b/charts/redhat/redhat-postgresql-persistent/src/values.schema.json
@@ -41,7 +41,7 @@
                 "tag": {
                     "type": "string",
                     "description": "Specify postgresql imagestream tag",
-                    "enum": ["latest", "13-el9", "13-el8", "12-el8", "12", "15-el9", "15-el8", "16-el9", "16-el8", "16-el10" ]
+                    "enum": ["latest", "13-el9", "13-el8", "12-el8", "12", "15-el9", "15-el8", "16-el9", "16-el8", "16-el10", "18-el9", "18-el10"]
                 }
             }
         },
diff --git a/charts/redhat/redhat-ruby-imagestreams/src/Chart.yaml b/charts/redhat/redhat-ruby-imagestreams/src/Chart.yaml
index 08d161f..21b6aff 100644
--- a/charts/redhat/redhat-ruby-imagestreams/src/Chart.yaml
+++ b/charts/redhat/redhat-ruby-imagestreams/src/Chart.yaml
@@ -5,10 +5,10 @@ description: |-
 annotations:
   charts.openshift.io/name: Red Hat Ruby applications on UBI (experimental)
 apiVersion: v2
-appVersion: 0.0.5
+appVersion: 0.0.6
 kubeVersion: '>=1.20.0'
 name: redhat-ruby-imagestreams
 tags: builder,ruby
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.5
+version: 0.0.6
diff --git a/charts/redhat/redhat-ruby-imagestreams/src/templates/ruby-imagestream.yaml b/charts/redhat/redhat-ruby-imagestreams/src/templates/ruby-imagestream.yaml
index 6fda593..2b7d0c2 100644
--- a/charts/redhat/redhat-ruby-imagestreams/src/templates/ruby-imagestream.yaml
+++ b/charts/redhat/redhat-ruby-imagestreams/src/templates/ruby-imagestream.yaml
@@ -21,7 +21,39 @@ spec:
       sampleRepo: https://github.com/sclorg/ruby-ex.git
     from:
       kind: ImageStreamTag
-      name: 3.3-ubi9
+      name: 4.0-ubi10
+    referencePolicy:
+      type: Local
+  - name: 4.0-ubi10
+    annotations:
+      openshift.io/display-name: Ruby 4.0 (UBI 10)
+      openshift.io/provider-display-name: Red Hat, Inc.
+      description: Build and run Ruby 4.0 applications on UBI 10. For more information
+        about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/4.0/README.md.
+      iconClass: icon-ruby
+      tags: builder,ruby
+      supports: ruby:4.0,ruby
+      version: '4.0'
+      sampleRepo: https://github.com/sclorg/ruby-ex.git
+    from:
+      kind: DockerImage
+      name: registry.redhat.io/ubi10/ruby-40:latest
+    referencePolicy:
+      type: Local
+  - name: 4.0-ubi9
+    annotations:
+      openshift.io/display-name: Ruby 4.0 (UBI 9)
+      openshift.io/provider-display-name: Red Hat, Inc.
+      description: Build and run Ruby 4.0 applications on UBI 9. For more information
+        about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/4.0/README.md.
+      iconClass: icon-ruby
+      tags: builder,ruby
+      supports: ruby:4.0,ruby
+      version: '4.0'
+      sampleRepo: https://github.com/sclorg/ruby-ex.git
+    from:
+      kind: DockerImage
+      name: registry.redhat.io/ubi9/ruby-40:latest
     referencePolicy:
       type: Local
   - name: 3.3-ubi10
diff --git a/charts/redhat/redhat-ruby-rails-application/src/Chart.yaml b/charts/redhat/redhat-ruby-rails-application/src/Chart.yaml
index 54e8e7c..d8401e7 100644
--- a/charts/redhat/redhat-ruby-rails-application/src/Chart.yaml
+++ b/charts/redhat/redhat-ruby-rails-application/src/Chart.yaml
@@ -2,13 +2,13 @@ description: This content is experimental, do not use it in production. An examp
   using this template, including OpenShift considerations, see https://github.com/sclorg/rails-ex/blob/master/README.md.
 name: redhat-ruby-rails-application
 tags: quickstart,ruby,rails
-version: 0.0.5
+version: 0.0.6
 kubeVersion: '>=1.20.0'
 annotations:
   charts.openshift.io/name: Red Hat Apache Rails application with no database (experimental)
   charts.openshift.io/provider: Red Hat
   charts.openshift.io/providerType: redhat
 apiVersion: v2
-appVersion: 0.0.5
+appVersion: 0.0.6
 sources:
   - https://github.com/sclorg/helm-charts
diff --git a/charts/redhat/redhat-ruby-rails-application/src/values.schema.json b/charts/redhat/redhat-ruby-rails-application/src/values.schema.json
index 962058b..c9029d9 100644
--- a/charts/redhat/redhat-ruby-rails-application/src/values.schema.json
+++ b/charts/redhat/redhat-ruby-rails-application/src/values.schema.json
@@ -13,7 +13,7 @@
         "ruby_version": {
             "type": "string",
             "description": "Version of Ruby image to be used (3.0-ubi8 by default).",
-            "enum": [ "latest", "2.5-ubi8", "3.3-ubi8", "3.0-ubi9", "3.3-ubi9", "3.3-ubi10"]
+            "enum": [ "latest", "2.5-ubi8", "3.3-ubi8", "3.0-ubi9", "3.3-ubi9", "3.3-ubi10", "4.0-ubi9", "4.0-ubi10"]
         },
         "memory_limit": {
             "type": "string",
diff --git a/tests/test_mariadb_imagestreams.py b/tests/test_mariadb_imagestreams.py
index 2755540..ae1a512 100644
--- a/tests/test_mariadb_imagestreams.py
+++ b/tests/test_mariadb_imagestreams.py
@@ -21,7 +21,9 @@ class TestHelmRHELMariadbImageStreams:
     @pytest.mark.parametrize(
         "version,registry,expected",
         [
-            ("10.11-el10", "registry.redhat.io/rhel10/mariadb-1011:latest", True),
+            ("11.8-el10", "registry.redhat.io/rhel10/mariadb-118:latest", True),
+            ("11.8-el10", "registry.redhat.io/rhel10/mariadb-118:latest", True),
+            ("10.11-el9", "registry.redhat.io/rhel9/mariadb-1011:latest", True),
             ("10.11-el9", "registry.redhat.io/rhel9/mariadb-1011:latest", True),
             ("10.11-el8", "registry.redhat.io/rhel8/mariadb-1011:latest", True),
             ("10.5-el9", "registry.redhat.io/rhel9/mariadb-105:latest", True),
diff --git a/tests/test_mariadb_template.py b/tests/test_mariadb_template.py
index bfd9499..bd0d247 100644
--- a/tests/test_mariadb_template.py
+++ b/tests/test_mariadb_template.py
@@ -29,6 +29,8 @@ def teardown_method(self):
             "10.5-el9",
             "10.11-el8",
             "10.11-el9",
+            "11.8-el9",
+            "11.8-el10"
         ],
     )
     def test_package_persistent(self, version):
diff --git a/tests/test_postgresql_imagestreams.py b/tests/test_postgresql_imagestreams.py
index bd669fe..afbdccd 100644
--- a/tests/test_postgresql_imagestreams.py
+++ b/tests/test_postgresql_imagestreams.py
@@ -30,6 +30,8 @@ class TestHelmRHELPostgresqlImageStreams:
             ("16-el8", "registry.redhat.io/rhel8/postgresql-16:latest", True),
             ("16-el9", "registry.redhat.io/rhel9/postgresql-16:latest", True),
             ("16-el10", "registry.redhat.io/rhel10/postgresql-16:latest", True),
+            ("18-el9", "registry.redhat.io/rhel9/postgresql-18:latest", True),
+            ("18-el10", "registry.redhat.io/rhel10/postgresql-18:latest", True),
         ],
     )
     def test_package_imagestream(self, helm_api, version, registry, expected):
diff --git a/tests/test_postgresql_template.py b/tests/test_postgresql_template.py
index b7a66c2..e66f747 100644
--- a/tests/test_postgresql_template.py
+++ b/tests/test_postgresql_template.py
@@ -28,6 +28,8 @@ def teardown_method(self):
             "16-el8",
             "16-el9",
             "16-el10",
+            "18-el9",
+            "18-el10"
         ],
     )
     def test_package_persistent(self, version):
diff --git a/tests/test_ruby_imagestreams.py b/tests/test_ruby_imagestreams.py
index a11d9b9..19ae865 100644
--- a/tests/test_ruby_imagestreams.py
+++ b/tests/test_ruby_imagestreams.py
@@ -22,6 +22,8 @@ class TestHelmRHELRubyImageStreams:
     @pytest.mark.parametrize(
         "version,registry,expected",
         [
+            ("4.0-ubi10", "registry.redhat.io/ubi10/ruby-40:latest", True),
+            ("4.0-ubi9", "registry.redhat.io/ubi9/ruby-40:latest", True),
             ("3.3-ubi10", "registry.redhat.io/ubi10/ruby-33:latest", True),
             ("3.3-ubi9", "registry.redhat.io/ubi9/ruby-33:latest", True),
             ("3.3-ubi8", "registry.redhat.io/ubi8/ruby-33:latest", True),
diff --git a/tests/test_ruby_rails_application.py b/tests/test_ruby_rails_application.py
index 06ee534..7bed253 100644
--- a/tests/test_ruby_rails_application.py
+++ b/tests/test_ruby_rails_application.py
@@ -21,6 +21,7 @@ def teardown_method(self):
     @pytest.mark.parametrize(
         "version,branch",
         [
+            ("4.0-ubi9", "4.0"),
             ("3.3-ubi9", "3.3"),
             ("3.3-ubi8", "3.3"),
             ("3.0-ubi9", "master"),