Update to xPaaS v1.4.6

1 files changed, 566 insertions, 206 deletions

diff --git a/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json b/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json
index af66b9ea4..ed2dbf572 100644
--- a/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json
+++ b/roles/openshift_examples/files/examples/v3.7/xpaas-streams/jboss-image-streams.json
@@ -4,7 +4,8 @@
     "metadata": {
         "name": "jboss-image-streams",
         "annotations": {
-            "description": "ImageStream definitions for JBoss Middleware products."
+            "description": "ImageStream definitions for JBoss Middleware products.",
+            "openshift.io/provider-display-name": "Red Hat, Inc."
         }
     },
     "items": [
@@ -14,23 +15,27 @@
             "metadata": {
                 "name": "jboss-webserver30-tomcat7-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 7"
+                    "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Apache Tomcat 7",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat7-openshift",
                 "tags": [
                     {
                         "name": "1.1",
                         "annotations": {
-                            "description": "JBoss Web Server 3.0 Tomcat 7 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,tomcat,tomcat7,java,jboss,xpaas",
-                            "supports": "tomcat7:3.0,tomcat:7,java:8,xpaas:1.1",
+                            "description": "JBoss Web Server 3.0 Apache Tomcat 7 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat7,java,jboss,hidden",
+                            "supports": "tomcat7:3.0,tomcat:7,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.1",
-                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 7"
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Apache Tomcat 7"
                         },
                         "from": {
                             "kind": "DockerImage",
@@ -40,14 +45,14 @@
                     {
                         "name": "1.2",
                         "annotations": {
-                            "description": "JBoss Web Server 3.0 Tomcat 7 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,tomcat,tomcat7,java,jboss,xpaas",
-                            "supports": "tomcat7:3.0,tomcat:7,java:8,xpaas:1.2",
+                            "description": "JBoss Web Server 3.0 Apache Tomcat 7 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat7,java,jboss,hidden",
+                            "supports": "tomcat7:3.0,tomcat:7,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.2",
-                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 7"
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Apache Tomcat 7"
                         },
                         "from": {
                             "kind": "DockerImage",
@@ -57,13 +62,14 @@
                     {
                         "name": "1.3",
                         "annotations": {
-                            "description": "JBoss Web Server 3.0 Tomcat 7 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,tomcat,tomcat7,java,jboss,xpaas",
-                            "supports":"tomcat7:3.0,tomcat:7,java:8,xpaas:1.3",
+                            "description": "JBoss Web Server 3.0 Apache Tomcat 7 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat7,java,jboss,hidden",
+                            "supports": "tomcat7:3.0,tomcat:7,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
-                            "version": "1.3"
+                            "version": "1.3",
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 ApacheTomcat 7"
                         },
                         "from": {
                             "kind": "DockerImage",
@@ -79,23 +85,27 @@
             "metadata": {
                 "name": "jboss-webserver30-tomcat8-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 8"
+                    "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Apache Tomcat 8",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-webserver-3/webserver30-tomcat8-openshift",
                 "tags": [
                     {
                         "name": "1.1",
                         "annotations": {
-                            "description": "JBoss Web Server 3.0 Tomcat 8 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,tomcat,tomcat8,java,jboss,xpaas",
-                            "supports": "tomcat8:3.0,tomcat:8,java:8,xpaas:1.1",
+                            "description": "JBoss Web Server 3.0 Apache Tomcat 8 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat8,java,jboss,hidden",
+                            "supports": "tomcat8:3.0,tomcat:8,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.1",
-                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 8"
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Apache Tomcat 8"
                         },
                         "from": {
                             "kind": "DockerImage",
@@ -105,14 +115,14 @@
                     {
                         "name": "1.2",
                         "annotations": {
-                            "description": "JBoss Web Server 3.0 Tomcat 8 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,tomcat,tomcat8,java,jboss,xpaas",
-                            "supports": "tomcat8:3.0,tomcat:8,java:8,xpaas:1.2",
+                            "description": "JBoss Web Server 3.0 Apache Tomcat 8 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat8,java,jboss,hidden",
+                            "supports": "tomcat8:3.0,tomcat:8,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.2",
-                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Tomcat 8"
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Apache Tomcat 8"
                         },
                         "from": {
                             "kind": "DockerImage",
@@ -122,13 +132,14 @@
                     {
                         "name": "1.3",
                         "annotations": {
-                            "description": "JBoss Web Server 3.0 Tomcat 8 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,tomcat,tomcat8,java,jboss,xpaas",
-                            "supports":"tomcat8:3.0,tomcat:8,java:8,xpaas:1.3",
+                            "description": "JBoss Web Server 3.0 Apache Tomcat 8 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat8,java,jboss,hidden",
+                            "supports": "tomcat8:3.0,tomcat:8,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
-                            "version": "1.3"
+                            "version": "1.3",
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.0 Apache Tomcat 8"
                         },
                         "from": {
                             "kind": "DockerImage",
@@ -144,28 +155,49 @@
             "metadata": {
                 "name": "jboss-webserver31-tomcat7-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 7"
+                    "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Apache Tomcat 7",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat7-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
-                            "description": "JBoss Web Server 3.1 Tomcat 7 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,tomcat,tomcat7,java,jboss,xpaas",
-                            "supports": "tomcat7:3.1,tomcat:7,java:8,xpaas:1.4",
+                            "description": "JBoss Web Server 3.1 Apache Tomcat 7 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat7,java,jboss,hidden",
+                            "supports": "tomcat7:3.1,tomcat:7,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.0",
-                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 7"
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Apache Tomcat 7"
                         },
                         "from": {
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat7-openshift:1.0"
                         }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "JBoss Web Server 3.1 Apache Tomcat 7 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat7,java,jboss,hidden",
+                            "supports": "tomcat7:3.1,tomcat:7,java:8",
+                            "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
+                            "sampleContextDir": "tomcat-websocket-chat",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Apache Tomcat 7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat7-openshift:1.1"
+                        }
                     }
                 ]
             }
@@ -176,28 +208,49 @@
             "metadata": {
                 "name": "jboss-webserver31-tomcat8-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 8"
+                    "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat8-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
-                            "description": "JBoss Web Server 3.1 Tomcat 8 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,tomcat,tomcat8,java,jboss,xpaas",
-                            "supports": "tomcat8:3.1,tomcat:8,java:8,xpaas:1.4",
+                            "description": "JBoss Web Server 3.1 Apache Tomcat 8 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat8,java,jboss,hidden",
+                            "supports": "tomcat8:3.1,tomcat:8,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "tomcat-websocket-chat",
                             "version": "1.0",
-                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Tomcat 8"
+                            "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8"
                         },
                         "from": {
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat8-openshift:1.0"
                         }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "JBoss Web Server 3.1 Apache Tomcat 8 S2I images.",
+                            "iconClass": "icon-rh-tomcat",
+                            "tags": "builder,tomcat,tomcat8,java,jboss,hidden",
+                            "supports": "tomcat8:3.1,tomcat:8,java:8",
+                            "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
+                            "sampleContextDir": "tomcat-websocket-chat",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Apache Tomcat 8"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat8-openshift:1.1"
+                        }
                     }
                 ]
             }
@@ -208,19 +261,23 @@
             "metadata": {
                 "name": "jboss-eap64-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                    "openshift.io/display-name": "Red Hat JBoss EAP 6.4",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-eap-6/eap64-openshift",
                 "tags": [
                     {
                         "name": "1.1",
                         "annotations": {
                             "description": "JBoss EAP 6.4 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports": "eap:6.4,javaee:6,java:8,xpaas:1.1",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:6.4,javaee:6,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "6.4.x",
@@ -236,9 +293,9 @@
                         "name": "1.2",
                         "annotations": {
                             "description": "JBoss EAP 6.4 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports": "eap:6.4,javaee:6,java:8,xpaas:1.2",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:6.4,javaee:6,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "6.4.x",
@@ -254,9 +311,9 @@
                         "name": "1.3",
                         "annotations": {
                             "description": "JBoss EAP 6.4 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports": "eap:6.4,javaee:6,java:8,xpaas:1.3",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:6.4,javaee:6,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "6.4.x",
@@ -272,9 +329,9 @@
                         "name": "1.4",
                         "annotations": {
                             "description": "JBoss EAP 6.4 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports": "eap:6.4,javaee:6,java:8,xpaas:1.4",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:6.4,javaee:6,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "6.4.x",
@@ -290,9 +347,9 @@
                         "name": "1.5",
                         "annotations": {
                             "description": "JBoss EAP 6.4 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports":"eap:6.4,javaee:6,java:8,xpaas:1.5",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:6.4,javaee:6,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "6.4.x",
@@ -303,6 +360,24 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.5"
                         }
+                    },
+                    {
+                        "name": "1.6",
+                        "annotations": {
+                            "description": "JBoss EAP 6.4 S2I images.",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:6.4,javaee:6,java:8",
+                            "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "6.4.x",
+                            "version": "1.6",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 6.4"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-6/eap64-openshift:1.6"
+                        }
                     }
                 ]
             }
@@ -313,19 +388,23 @@
             "metadata": {
                 "name": "jboss-eap70-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss EAP 7.0"
+                    "openshift.io/display-name": "Red Hat JBoss EAP 7.0",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-eap-7/eap70-openshift",
                 "tags": [
                     {
                         "name": "1.3",
                         "annotations": {
                             "description": "JBoss EAP 7.0 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports": "eap:7.0,javaee:7,java:8,xpaas:1.3",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.0,javaee:7,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "7.0.0.GA",
@@ -341,9 +420,9 @@
                         "name": "1.4",
                         "annotations": {
                             "description": "JBoss EAP 7.0 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports": "eap:7.0,javaee:7,java:8,xpaas:1.4",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.0,javaee:7,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "7.0.0.GA",
@@ -359,9 +438,9 @@
                         "name": "1.5",
                         "annotations": {
                             "description": "JBoss EAP 7.0 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports":"eap:7.0,javaee:7,java:8,xpaas:1.5",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.0,javaee:7,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "7.0.0.GA",
@@ -372,6 +451,24 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-eap-7/eap70-openshift:1.5"
                         }
+                    },
+                    {
+                        "name": "1.6",
+                        "annotations": {
+                            "description": "JBoss EAP 7.0 S2I images.",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.0,javaee:7,java:8",
+                            "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "7.0.0.GA",
+                            "version": "1.6",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 7.0"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-7/eap70-openshift:1.6"
+                        }
                     }
                 ]
             }
@@ -382,27 +479,50 @@
             "metadata": {
                 "name": "jboss-eap71-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss EAP 7.1"
+                    "openshift.io/display-name": "Red Hat JBoss EAP 7.1",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-eap-7/eap71-openshift",
                 "tags": [
                     {
+                        "name": "TP",
+                        "annotations": {
+                            "description": "JBoss EAP 7.1 Tech Preview.",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.1,javaee:7,java:8,xpass:1.0",
+                            "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
+                            "sampleContextDir": "kitchensink",
+                            "sampleRef": "7.0.0.GA",
+                            "version": "TP",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 7.1 (Tech Preview)"
+                        },
+                        "from": {
+                          "kind": "ImageStreamTag",
+                          "name": "1.0-TP"
+                        }
+                    },
+                    {
                         "name": "1.0-TP",
                         "annotations": {
                             "description": "JBoss EAP 7.1 Tech Preview.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,eap,javaee,java,jboss,xpaas",
-                            "supports":"eap:7.1,javaee:7,java:8,xpaas:1.0",
+                            "iconClass": "icon-eap",
+                            "tags": "builder,eap,javaee,java,jboss,hidden",
+                            "supports": "eap:7.1,javaee:7,java:8",
                             "sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
                             "sampleContextDir": "kitchensink",
                             "sampleRef": "7.0.0.GA",
-                            "version": "1.0"
+                            "version": "1.0",
+                            "openshift.io/display-name": "Red Hat JBoss EAP 7.1 (Tech Preview)"
                         },
                         "from": {
-                          "kind": "DockerImage",
-                          "name": "registry.access.redhat.com/jboss-eap-7-tech-preview/eap71-openshift:1.0"
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-eap-7-tech-preview/eap71-openshift:1.0"
                         }
                     }
                 ]
@@ -414,19 +534,22 @@
             "metadata": {
                 "name": "jboss-decisionserver62-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss BRMS 6.2 decision server"
+                    "openshift.io/display-name": "Red Hat JBoss BRMS 6.2 decision server",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver62-openshift",
                 "tags": [
                     {
                         "name": "1.2",
                         "annotations": {
                             "description": "Red Hat JBoss BRMS 6.2 decision server S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,decisionserver,xpaas",
-                            "supports": "decisionserver:6.2,xpaas:1.2",
+                            "iconClass": "icon-decisionserver",
+                            "tags": "builder,decisionserver,hidden",
+                            "supports": "decisionserver:6.2",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "decisionserver/hellorules",
                             "sampleRef": "1.2",
@@ -447,19 +570,23 @@
             "metadata": {
                 "name": "jboss-decisionserver63-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss BRMS 6.3 decision server"
+                    "openshift.io/display-name": "Red Hat JBoss BRMS 6.3 decision server",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver63-openshift",
                 "tags": [
                     {
                         "name": "1.3",
                         "annotations": {
                             "description": "Red Hat JBoss BRMS 6.3 decision server S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,decisionserver,xpaas",
-                            "supports": "decisionserver:6.3,xpaas:1.3",
+                            "iconClass": "icon-decisionserver",
+                            "tags": "builder,decisionserver,hidden",
+                            "supports": "decisionserver:6.3",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "decisionserver/hellorules",
                             "sampleRef": "1.3",
@@ -475,9 +602,9 @@
                         "name": "1.4",
                         "annotations": {
                             "description": "Red Hat JBoss BRMS 6.3 decision server S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,decisionserver,java,xpaas",
-                            "supports":"decisionserver:6.3,java:8,xpaas:1.4",
+                            "iconClass": "icon-decisionserver",
+                            "tags": "builder,decisionserver,java,hidden",
+                            "supports": "decisionserver:6.3,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "decisionserver/hellorules",
                             "sampleRef": "1.3",
@@ -496,18 +623,25 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "jboss-decisionserver64-openshift"
+                "name": "jboss-decisionserver64-openshift",
+                "annotations": {
+                    "openshift.io/display-name": "Red Hat JBoss BRMS 6.4 decision server",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
+                }
+            },
+            "labels": {
+                "xpaas": "1.4.7"
             },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver64-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "Red Hat JBoss BRMS 6.4 decision server S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,decisionserver,java,xpaas",
-                            "supports":"decisionserver:6.4,java:8,xpaas:1.4",
+                            "iconClass": "icon-decisionserver",
+                            "tags": "builder,decisionserver,java,hidden",
+                            "supports": "decisionserver:6.4,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "decisionserver/hellorules",
                             "sampleRef": "1.3",
@@ -518,6 +652,24 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver64-openshift:1.0"
                         }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "Red Hat JBoss BRMS 6.4 decision server S2I images.",
+                            "iconClass": "icon-decisionserver",
+                            "tags": "builder,decisionserver,java,hidden",
+                            "supports": "decisionserver:6.4,java:8",
+                            "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
+                            "sampleContextDir": "decisionserver/hellorules",
+                            "sampleRef": "1.3",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss BRMS 6.4 decision server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-decisionserver-6/decisionserver64-openshift:1.1"
+                        }
                     }
                 ]
             }
@@ -528,19 +680,23 @@
             "metadata": {
                 "name": "jboss-processserver63-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.3 intelligent process server"
+                    "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.3 intelligent process server",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-processserver-6/processserver63-openshift",
                 "tags": [
                     {
                         "name": "1.3",
                         "annotations": {
                             "description": "Red Hat JBoss BPM Suite 6.3 intelligent process server S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,processserver,xpaas",
-                            "supports": "processserver:6.3,xpaas:1.3",
+                            "iconClass": "icon-processserver",
+                            "tags": "builder,processserver,hidden",
+                            "supports": "processserver:6.3",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "processserver/library",
                             "sampleRef": "1.3",
@@ -556,9 +712,9 @@
                         "name": "1.4",
                         "annotations": {
                             "description": "Red Hat JBoss BPM Suite 6.3 intelligent process server S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,processserver,java,xpaas",
-                            "supports":"processserver:6.3,java:8,xpaas:1.4",
+                            "iconClass": "icon-processserver",
+                            "tags": "builder,processserver,java,hidden",
+                            "supports": "processserver:6.3,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "processserver/library",
                             "sampleRef": "1.3",
@@ -577,18 +733,25 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "jboss-processserver64-openshift"
+                "name": "jboss-processserver64-openshift",
+                "annotations": {
+                    "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.4 intelligent process server",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
+                }
+            },
+            "labels": {
+                "xpaas": "1.4.7"
             },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-processserver-6/processserver64-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "Red Hat JBoss BPM Suite 6.4 intelligent process server S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,processserver,java,xpaas",
-                            "supports":"processserver:6.4,java:8,xpaas:1.4",
+                            "iconClass": "icon-processserver",
+                            "tags": "builder,processserver,java,hidden",
+                            "supports": "processserver:6.4,java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
                             "sampleContextDir": "processserver/library",
                             "sampleRef": "1.3",
@@ -599,6 +762,24 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-processserver-6/processserver64-openshift:1.0"
                         }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "Red Hat JBoss BPM Suite 6.4 intelligent process server S2I images.",
+                            "iconClass": "icon-processserver",
+                            "tags": "builder,processserver,java,hidden",
+                            "supports": "processserver:6.4,java:8",
+                            "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts.git",
+                            "sampleContextDir": "processserver/library",
+                            "sampleRef": "1.3",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss BPM Suite 6.4 intelligent process server"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-processserver-6/processserver64-openshift:1.1"
+                        }
                     }
                 ]
             }
@@ -609,19 +790,23 @@
             "metadata": {
                 "name": "jboss-datagrid65-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
+                    "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift",
                 "tags": [
                     {
                         "name": "1.2",
                         "annotations": {
                             "description": "JBoss Data Grid 6.5 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "datagrid,jboss,xpaas",
-                            "supports": "datagrid:6.5,xpaas:1.2",
+                            "iconClass": "icon-datagrid",
+                            "tags": "datagrid,jboss,hidden",
+                            "supports": "datagrid:6.5",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
                         },
@@ -634,9 +819,9 @@
                         "name": "1.3",
                         "annotations": {
                             "description": "JBoss Data Grid 6.5 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "datagrid,jboss,xpaas",
-                            "supports": "datagrid:6.5,xpaas:1.4",
+                            "iconClass": "icon-datagrid",
+                            "tags": "datagrid,jboss,hidden",
+                            "supports": "datagrid:6.5",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
                         },
@@ -649,9 +834,9 @@
                         "name": "1.4",
                         "annotations": {
                             "description": "JBoss Data Grid 6.5 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "datagrid,jboss,xpaas",
-                            "supports":"datagrid:6.5,xpaas:1.4",
+                            "iconClass": "icon-datagrid",
+                            "tags": "datagrid,jboss,hidden",
+                            "supports": "datagrid:6.5",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
                         },
@@ -659,6 +844,21 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift:1.4"
                         }
+                    },
+                    {
+                        "name": "1.5",
+                        "annotations": {
+                            "description": "JBoss Data Grid 6.5 S2I images.",
+                            "iconClass": "icon-datagrid",
+                            "tags": "datagrid,jboss,hidden",
+                            "supports": "datagrid:6.5",
+                            "version": "1.5",
+                            "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-openshift:1.5"
+                        }
                     }
                 ]
             }
@@ -669,19 +869,23 @@
             "metadata": {
                 "name": "jboss-datagrid71-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1"
+                    "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "JBoss Data Grid 7.1 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "datagrid,jboss,xpaas",
-                            "supports": "datagrid:7.1,xpaas:1.0",
+                            "iconClass": "icon-datagrid",
+                            "tags": "datagrid,jboss,hidden",
+                            "supports": "datagrid:7.1",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1"
                         },
@@ -689,6 +893,21 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-openshift:1.0"
                         }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "JBoss Data Grid 7.1 S2I images.",
+                            "iconClass": "icon-datagrid",
+                            "tags": "datagrid,jboss,hidden",
+                            "supports": "datagrid:7.1",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-openshift:1.1"
+                        }
                     }
                 ]
             }
@@ -699,18 +918,22 @@
             "metadata": {
                 "name": "jboss-datagrid65-client-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5 Client Modules for EAP"
+                    "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5 Client Modules for EAP",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-client-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "JBoss Data Grid 6.5 Client Modules for EAP.",
-                            "iconClass": "icon-jboss",
-                            "tags": "client,jboss,xpaas",
+                            "iconClass": "icon-datagrid",
+                            "tags": "client,jboss,hidden",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5 Client Modules for EAP"
                         },
@@ -718,6 +941,20 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-client-openshift:1.0"
                         }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "JBoss Data Grid 6.5 Client Modules for EAP.",
+                            "iconClass": "icon-datagrid",
+                            "tags": "client,jboss,hidden",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss Data Grid 6.5 Client Modules for EAP"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datagrid-6/datagrid65-client-openshift:1.1"
+                        }
                     }
                 ]
             }
@@ -728,18 +965,22 @@
             "metadata": {
                 "name": "jboss-datagrid71-client-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1 Client Modules for EAP"
+                    "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1 Client Modules for EAP",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-datagrid-7/datagrid71-client-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "JBoss Data Grid 7.1 Client Modules for EAP.",
-                            "iconClass": "icon-jboss",
-                            "tags": "client,jboss,xpaas",
+                            "iconClass": "icon-datagrid",
+                            "tags": "client,jboss,hidden",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Grid 7.1 Client Modules for EAP"
                         },
@@ -757,19 +998,23 @@
             "metadata": {
                 "name": "jboss-datavirt63-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
+                    "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "Red Hat JBoss Data Virtualization 6.3 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "datavirt,jboss,xpaas",
-                            "supports": "datavirt:6.3,xpaas:1.4",
+                            "iconClass": "icon-datavirt",
+                            "tags": "datavirt,jboss,hidden",
+                            "supports": "datavirt:6.3",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
                         },
@@ -782,9 +1027,9 @@
                         "name": "1.1",
                         "annotations": {
                             "description": "Red Hat JBoss Data Virtualization 6.3 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "datavirt,jboss,xpaas",
-                            "supports": "datavirt:6.3,xpaas:1.4",
+                            "iconClass": "icon-datavirt",
+                            "tags": "datavirt,jboss,hidden",
+                            "supports": "datavirt:6.3",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
                         },
@@ -797,9 +1042,9 @@
                         "name": "1.2",
                         "annotations": {
                             "description": "Red Hat JBoss Data Virtualization 6.3 S2I images.",
-                            "iconClass": "icon-jboss",
-                            "tags": "datavirt,jboss,xpaas",
-                            "supports":"datavirt:6.3,xpaas:1.4",
+                            "iconClass": "icon-datavirt",
+                            "tags": "datavirt,jboss,hidden",
+                            "supports": "datavirt:6.3",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
                         },
@@ -807,7 +1052,22 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift:1.2"
                         }
-                    }
+                    },
+                    {
+                        "name": "1.3",
+                        "annotations": {
+                            "description": "Red Hat JBoss Data Virtualization 6.3 S2I images.",
+                            "iconClass": "icon-datavirt",
+                            "tags": "datavirt,jboss,hidden",
+                            "supports":"datavirt:6.3",
+                            "version": "1.3",
+                            "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-openshift:1.3"
+                        }
+                     }
                 ]
             }
         },
@@ -817,18 +1077,22 @@
             "metadata": {
                 "name": "jboss-datavirt63-driver-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.5 JDBC Driver Modules for EAP"
+                    "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.5 JDBC Driver Modules for EAP",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-driver-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "JBoss Data Virtualization 6.5 JDBC Driver Modules for EAP.",
-                            "iconClass": "icon-jboss",
-                            "tags": "client,jboss,xpaas",
+                            "iconClass": "icon-datavirt",
+                            "tags": "client,jboss,hidden",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.5 JDBC Driver Modules for EAP"
                         },
@@ -836,6 +1100,20 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-driver-openshift:1.0"
                         }
+                    },
+                    {
+                        "name": "1.1",
+                        "annotations": {
+                            "description": "JBoss Data Virtualization 6.5 JDBC Driver Modules for EAP.",
+                            "iconClass": "icon-datavirt",
+                            "tags": "client,jboss,hidden",
+                            "version": "1.1",
+                            "openshift.io/display-name": "Red Hat JBoss Data Virtualization 6.5 JDBC Driver Modules for EAP"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-datavirt-6/datavirt63-driver-openshift:1.1"
+                        }
                     }
                 ]
             }
@@ -846,19 +1124,23 @@
             "metadata": {
                 "name": "jboss-amq-62",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                    "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-amq-6/amq62-openshift",
                 "tags": [
                     {
                         "name": "1.1",
                         "annotations": {
                             "description": "JBoss A-MQ 6.2 broker image.",
-                            "iconClass": "icon-jboss",
-                            "tags": "messaging,amq,jboss,xpaas",
-                            "supports": "amq:6.2,messaging,xpaas:1.1",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports": "amq:6.2,messaging",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
                         },
@@ -871,9 +1153,9 @@
                         "name": "1.2",
                         "annotations": {
                             "description": "JBoss A-MQ 6.2 broker image.",
-                            "iconClass": "icon-jboss",
-                            "tags": "messaging,amq,jboss,xpaas",
-                            "supports": "amq:6.2,messaging,xpaas:1.2",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports": "amq:6.2,messaging",
                             "version": "1.2",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
                         },
@@ -886,9 +1168,9 @@
                         "name": "1.3",
                         "annotations": {
                             "description": "JBoss A-MQ 6.2 broker image.",
-                            "iconClass": "icon-jboss",
-                            "tags": "messaging,amq,jboss,xpaas",
-                            "supports": "amq:6.2,messaging,xpaas:1.3",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports": "amq:6.2,messaging",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
                         },
@@ -901,9 +1183,9 @@
                         "name": "1.4",
                         "annotations": {
                             "description": "JBoss A-MQ 6.2 broker image.",
-                            "iconClass": "icon-jboss",
-                            "tags": "messaging,amq,jboss,xpaas",
-                            "supports":"amq:6.2,messaging,xpaas:1.4",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports": "amq:6.2,messaging",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
                         },
@@ -916,9 +1198,9 @@
                         "name": "1.5",
                         "annotations": {
                             "description": "JBoss A-MQ 6.2 broker image.",
-                            "iconClass": "icon-jboss",
-                            "tags": "messaging,amq,jboss,xpaas",
-                            "supports":"amq:6.2,messaging,xpaas:1.5",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports": "amq:6.2,messaging",
                             "version": "1.5",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
                         },
@@ -926,7 +1208,22 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.5"
                         }
-                    }
+                    },
+                    {
+                        "name": "1.6",
+                        "annotations": {
+                            "description": "JBoss A-MQ 6.2 broker image.",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports":"amq:6.2,messaging",
+                            "version": "1.6",
+                            "openshift.io/display-name": "Red Hat JBoss A-MQ 6.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq62-openshift:1.6"
+                        }
+                     }
                 ]
             }
         },
@@ -936,19 +1233,23 @@
             "metadata": {
                 "name": "jboss-amq-63",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3"
+                    "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/jboss-amq-6/amq63-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "JBoss A-MQ 6.3 broker image.",
-                            "iconClass": "icon-jboss",
-                            "tags": "messaging,amq,jboss,xpaas",
-                            "supports": "amq:6.3,messaging,xpaas:1.0",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports": "amq:6.3,messaging",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3"
                         },
@@ -961,9 +1262,9 @@
                         "name": "1.1",
                         "annotations": {
                             "description": "JBoss A-MQ 6.3 broker image.",
-                            "iconClass": "icon-jboss",
-                            "tags": "messaging,amq,jboss,xpaas",
-                            "supports": "amq:6.3,messaging,xpaas:1.1",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports": "amq:6.3,messaging",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3"
                         },
@@ -971,6 +1272,21 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/jboss-amq-6/amq63-openshift:1.1"
                         }
+                    },
+                    {
+                        "name": "1.2",
+                        "annotations": {
+                            "description": "JBoss A-MQ 6.3 broker image.",
+                            "iconClass": "icon-amq",
+                            "tags": "messaging,amq,jboss,hidden",
+                            "supports": "amq:6.3,messaging",
+                            "version": "1.2",
+                            "openshift.io/display-name": "Red Hat JBoss A-MQ 6.3"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/jboss-amq-6/amq63-openshift:1.2"
+                        }
                     }
                 ]
             }
@@ -982,19 +1298,23 @@
                 "name": "redhat-sso70-openshift",
                 "annotations": {
                     "description": "Red Hat SSO 7.0",
-                    "openshift.io/display-name": "Red Hat Single Sign-On 7.0"
+                    "openshift.io/display-name": "Red Hat Single Sign-On 7.0",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/redhat-sso-7/sso70-openshift",
                 "tags": [
                     {
                         "name": "1.3",
                         "annotations": {
                             "description": "Red Hat SSO 7.0",
-                            "iconClass": "icon-jboss",
-                            "tags": "sso,keycloak,redhat",
-                            "supports": "sso:7.0,xpaas:1.3",
+                            "iconClass": "icon-sso",
+                            "tags": "sso,keycloak,redhat,hidden",
+                            "supports": "sso:7.0",
                             "version": "1.3",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.0"
                         },
@@ -1007,9 +1327,9 @@
                         "name": "1.4",
                         "annotations": {
                             "description": "Red Hat SSO 7.0",
-                            "iconClass": "icon-jboss",
-                            "tags": "sso,keycloak,redhat",
-                            "supports": "sso:7.0,xpaas:1.4",
+                            "iconClass": "icon-sso",
+                            "tags": "sso,keycloak,redhat,hidden",
+                            "supports": "sso:7.0",
                             "version": "1.4",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.0"
                         },
@@ -1028,19 +1348,23 @@
                 "name": "redhat-sso71-openshift",
                 "annotations": {
                     "description": "Red Hat SSO 7.1",
-                    "openshift.io/display-name": "Red Hat Single Sign-On 7.1"
+                    "openshift.io/display-name": "Red Hat Single Sign-On 7.1",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/redhat-sso-7/sso71-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "description": "Red Hat SSO 7.1",
-                            "iconClass": "icon-jboss",
-                            "tags": "sso,keycloak,redhat",
-                            "supports": "sso:7.1,xpaas:1.4",
+                            "iconClass": "icon-sso",
+                            "tags": "sso,keycloak,redhat,hidden",
+                            "supports": "sso:7.1",
                             "version": "1.0",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.1"
                         },
@@ -1053,9 +1377,9 @@
                         "name": "1.1",
                         "annotations": {
                             "description": "Red Hat SSO 7.1",
-                            "iconClass": "icon-jboss",
-                            "tags": "sso,keycloak,redhat",
-                            "supports": "sso:7.1,xpaas:1.4",
+                            "iconClass": "icon-sso",
+                            "tags": "sso,keycloak,redhat,hidden",
+                            "supports": "sso:7.1",
                             "version": "1.1",
                             "openshift.io/display-name": "Red Hat Single Sign-On 7.1"
                         },
@@ -1063,6 +1387,21 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/redhat-sso-7/sso71-openshift:1.1"
                         }
+                    },
+                    {
+                        "name": "1.2",
+                        "annotations": {
+                            "description": "Red Hat SSO 7.1",
+                            "iconClass": "icon-sso",
+                            "tags": "sso,keycloak,redhat,hidden",
+                            "supports": "sso:7.1",
+                            "version": "1.2",
+                            "openshift.io/display-name": "Red Hat Single Sign-On 7.1"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-sso-7/sso71-openshift:1.2"
+                        }
                     }
                 ]
             }
@@ -1073,20 +1412,24 @@
             "metadata": {
                 "name": "redhat-openjdk18-openshift",
                 "annotations": {
-                    "openshift.io/display-name": "Red Hat OpenJDK 8"
+                    "openshift.io/display-name": "Red Hat OpenJDK 8",
+                    "openshift.io/provider-display-name": "Red Hat, Inc.",
+                    "version": "1.4.7"
                 }
             },
+            "labels": {
+                "xpaas": "1.4.7"
+            },
             "spec": {
-                "dockerImageRepository": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift",
                 "tags": [
                     {
                         "name": "1.0",
                         "annotations": {
                             "openshift.io/display-name": "Red Hat OpenJDK 8",
                             "description": "Build and run Java applications using Maven and OpenJDK 8.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,java,xpaas,openjdk",
-                            "supports": "java:8,xpaas:1.0",
+                            "iconClass": "icon-rh-openjdk",
+                            "tags": "builder,java,openjdk,hidden",
+                            "supports": "java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
                             "sampleContextDir": "undertow-servlet",
                             "version": "1.0"
@@ -1101,9 +1444,9 @@
                         "annotations": {
                             "openshift.io/display-name": "Red Hat OpenJDK 8",
                             "description": "Build and run Java applications using Maven and OpenJDK 8.",
-                            "iconClass": "icon-jboss",
-                            "tags": "builder,java,xpaas,openjdk",
-                            "supports": "java:8,xpaas:1.4",
+                            "iconClass": "icon-rh-openjdk",
+                            "tags": "builder,java,openjdk",
+                            "supports": "java:8",
                             "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
                             "sampleContextDir": "undertow-servlet",
                             "version": "1.1"
@@ -1112,6 +1455,23 @@
                             "kind": "DockerImage",
                             "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.1"
                         }
+                    },
+                    {
+                        "name": "1.2",
+                        "annotations": {
+                            "openshift.io/display-name": "Red Hat OpenJDK 8",
+                            "description": "Build and run Java applications using Maven and OpenJDK 8.",
+                            "iconClass": "icon-rh-openjdk",
+                            "tags": "builder,java,openjdk",
+                            "supports": "java:8",
+                            "sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
+                            "sampleContextDir": "undertow-servlet",
+                            "version": "1.2"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.2"
+                        }
                     }
                 ]
             }