diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml
index 60d9c120..c3d89d7a 100644
--- a/imagestreams/imagestreams.yaml
+++ b/imagestreams/imagestreams.yaml
@@ -13,10 +13,10 @@
     latest: "15-el9"
     distros:
       - name: CentOS Stream 8
-        app_versions: [10, 12, 13, 15, 16]
+        app_versions: [10, 12, 13, 15]
 
       - name: CentOS Stream 9
-        app_versions: [13, 15, 16]
+        app_versions: [13, 15]
 
   - filename: postgresql-rhel.json
     latest: "15-el8"
@@ -25,16 +25,16 @@
         app_versions: [10, 12, 13]
 
       - name: RHEL 8
-        app_versions: [10, 12, 13, 15, 16]
+        app_versions: [10, 12, 13, 15]
 
       - name: RHEL 9
-        app_versions: [13, 15, 16]
+        app_versions: [13, 15]
 
   - filename: postgresql-rhel-aarch64.json
     latest: "13-el8"
     distros:
       - name: RHEL 8
-        app_versions: [10, 12, 13, 15, 16]
+        app_versions: [10, 12, 13, 15]
 
       - name: RHEL 9
-        app_versions: [13, 15, 16]
+        app_versions: [13, 15]
diff --git a/imagestreams/postgresql-centos.json b/imagestreams/postgresql-centos.json
index 6ced4653..1ce1bde2 100644
--- a/imagestreams/postgresql-centos.json
+++ b/imagestreams/postgresql-centos.json
@@ -81,24 +81,6 @@
           "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": "13-el9",
         "annotations": {
@@ -135,24 +117,6 @@
           "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": "latest",
         "annotations": {
diff --git a/imagestreams/postgresql-rhel-aarch64.json b/imagestreams/postgresql-rhel-aarch64.json
index b6859cf9..874df97c 100644
--- a/imagestreams/postgresql-rhel-aarch64.json
+++ b/imagestreams/postgresql-rhel-aarch64.json
@@ -81,24 +81,6 @@
           "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": "13-el9",
         "annotations": {
@@ -135,24 +117,6 @@
           "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": "latest",
         "annotations": {
diff --git a/imagestreams/postgresql-rhel.json b/imagestreams/postgresql-rhel.json
index a7df5856..b890a851 100644
--- a/imagestreams/postgresql-rhel.json
+++ b/imagestreams/postgresql-rhel.json
@@ -135,24 +135,6 @@
           "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": "13-el9",
         "annotations": {
@@ -189,24 +171,6 @@
           "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": "latest",
         "annotations": {
diff --git a/test/test-lib-postgresql.sh b/test/test-lib-postgresql.sh
index d8e4089e..dfb79a1a 100644
--- a/test/test-lib-postgresql.sh
+++ b/test/test-lib-postgresql.sh
@@ -69,6 +69,15 @@ function test_postgresql_imagestream() {
 
 
 function run_latest_imagestreams_test() {
+  # 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
   local result=1
   # Switch to root directory of a container
   echo "Testing the latest version in imagestreams"