diff --git a/templates/jws56-openj9-tomcat9-ubi8-image-stream.json b/templates/jws56-openj9-tomcat9-ubi8-image-stream.json
index 2c96696..b562ab2 100644
--- a/templates/jws56-openj9-tomcat9-ubi8-image-stream.json
+++ b/templates/jws56-openj9-tomcat9-ubi8-image-stream.json
@@ -37,14 +37,14 @@
                             "version": "latest",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
                             "kind": "DockerImage",
                             "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:latest"
                         },
-			"importPolicy": {
+                        "importPolicy": {
                             "insecure": true
                         }
                     },
@@ -60,14 +60,14 @@
                             "version": "1.2",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
                             "kind": "DockerImage",
                             "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:5.6.0"
                         },
-			"importPolicy": {
+                        "importPolicy": {
                             "insecure": true
                         }
                     },
@@ -83,14 +83,14 @@
                             "version": "1.2",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJ9 JDK11 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
                             "kind": "DockerImage",
                             "name": "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8:5.6.1"
                         },
-			"importPolicy": {
+                        "importPolicy": {
                             "insecure": true
                         }
                     }
@@ -98,4 +98,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json b/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json
index b6c917c..a46fd88 100644
--- a/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json
+++ b/templates/jws56-openjdk11-tomcat9-ubi8-image-stream.json
@@ -18,11 +18,11 @@
                     "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8",
                     "openshift.io/provider-display-name": "Red Hat, Inc.",
                     "version": "5.6"
+                },
+                "labels": {
+                    "samples.operator.openshift.io/managed": "true"
                 }
             },
-            "labels": {
-                "jws56jdk11ubi8": "5.6.1"
-            },
             "spec": {
                 "tags": [
                     {
@@ -37,7 +37,7 @@
                             "version": "latest",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
@@ -57,7 +57,7 @@
                             "version": "1.2",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
@@ -77,7 +77,7 @@
                             "version": "1.2",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK11 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
@@ -89,4 +89,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json b/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json
index 0bfb6a5..7306df9 100644
--- a/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json
+++ b/templates/jws56-openjdk8-tomcat9-ubi8-image-stream.json
@@ -18,11 +18,11 @@
                     "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8",
                     "openshift.io/provider-display-name": "Red Hat, Inc.",
                     "version": "5.6"
+                },
+                "labels": {
+                    "samples.operator.openshift.io/managed": "true"
                 }
             },
-            "labels": {
-                "jws56jdk8ubi8": "5.6.1"
-            },
             "spec": {
                 "tags": [
                     {
@@ -37,7 +37,7 @@
                             "version": "latest",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
@@ -57,7 +57,7 @@
                             "version": "1.2",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
@@ -77,7 +77,7 @@
                             "version": "1.2",
                             "openshift.io/display-name": "JBoss Web Server 5.6 Apache Tomcat 9 OpenJDK8 on UBI8"
                         },
-			"referencePolicy": {
+                        "referencePolicy": {
                             "type": "Local"
                         },
                         "from": {
@@ -89,4 +89,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file