diff --git a/imagestreams/postgresql-centos.json b/imagestreams/postgresql-centos.json
index ce9a2990..db1ea9d9 100644
--- a/imagestreams/postgresql-centos.json
+++ b/imagestreams/postgresql-centos.json
@@ -26,6 +26,24 @@
           "type": "Local"
         }
       },
+      {
+        "name": "16-el9",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 9)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 16 database on CentOS Stream 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": "16"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "quay.io/sclorg/postgresql-16-c9s:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "15-el9",
         "annotations": {
@@ -62,6 +80,24 @@
           "type": "Local"
         }
       },
+      {
+        "name": "16-el8",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 16 database on CentOS Stream 8. 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": "16"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "quay.io/sclorg/postgresql-16-c8s:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "15-el8",
         "annotations": {
diff --git a/imagestreams/postgresql-rhel-aarch64.json b/imagestreams/postgresql-rhel-aarch64.json
index db5121c2..6c8821a3 100644
--- a/imagestreams/postgresql-rhel-aarch64.json
+++ b/imagestreams/postgresql-rhel-aarch64.json
@@ -26,6 +26,42 @@
           "type": "Local"
         }
       },
+      {
+        "name": "16-el9",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 16 (RHEL 9)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 16 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": "16"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel9/postgresql-16:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "15-el9",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 15 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": "15"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel9/postgresql-15:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "13-el9",
         "annotations": {
@@ -44,6 +80,42 @@
           "type": "Local"
         }
       },
+      {
+        "name": "16-el8",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 16 (RHEL 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 16 database on RHEL 8. 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": "16"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel8/postgresql-16:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
+      {
+        "name": "15-el8",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 15 database on RHEL 8. 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": "15"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel8/postgresql-15:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "13-el8",
         "annotations": {
diff --git a/imagestreams/postgresql-rhel.json b/imagestreams/postgresql-rhel.json
index 4e698ced..45d44452 100644
--- a/imagestreams/postgresql-rhel.json
+++ b/imagestreams/postgresql-rhel.json
@@ -23,6 +23,24 @@
           "name": "15-el8"
         }
       },
+      {
+        "name": "16-el9",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 16 (RHEL 9)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 16 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": "16"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel9/postgresql-16:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "15-el9",
         "annotations": {
@@ -41,6 +59,24 @@
           "type": "Local"
         }
       },
+      {
+        "name": "16-el8",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 16 (RHEL 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 16 database on RHEL 8. 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": "16"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel8/postgresql-16:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "15-el8",
         "annotations": {
diff --git a/test/test-lib-postgresql.sh b/test/test-lib-postgresql.sh
index 998c6814..d8e4089e 100644
--- a/test/test-lib-postgresql.sh
+++ b/test/test-lib-postgresql.sh
@@ -18,6 +18,15 @@ function test_postgresql_integration() {
     namespace_image="rhscl/postgresql-${VERSION}-rhel7"
   else
     namespace_image="${OS}/postgresql-${VERSION}"
+    # Check if the current version is already GA
+    # This directory is cloned from TMT plan repo 'sclorg-tmt-plans'
+    local devel_file="/root/sclorg-tmt-plans/devel_images"
+    if [ -f "${devel_file}" ]; then
+      if grep -q "${OS}=postgresql-container=${VERSION}" "$devel_file" ; then
+        echo "This version is currently developed, so skipping this test."
+        return
+      fi
+    fi
   fi
   TEMPLATES="postgresql-ephemeral-template.json
   postgresql-persistent-template.json"
@@ -42,6 +51,15 @@ function test_postgresql_imagestream() {
   elif [ "${OS}" == "rhel9" ]; then
     tag="-el9"
   fi
+  # Check if the current version is already GA
+  # This directory is cloned from TMT plan repo 'sclorg-tmt-plans'
+  local devel_file="/root/sclorg-tmt-plans/devel_images"
+  if [ -f "${devel_file}" ]; then
+    if grep -q "${OS}=postgresql-container=${VERSION}" "$devel_file" ; then
+      echo "This version is currently developed, so skipping this test."
+      return
+    fi
+  fi
   TEMPLATES="postgresql-ephemeral-template.json
   postgresql-persistent-template.json"
   for template in $TEMPLATES; do