diff --git a/templates/gogs/gogs-persistent-template.yaml b/templates/gogs/gogs-persistent-template.yaml
index b555c8e5..8acc0da9 100644
--- a/templates/gogs/gogs-persistent-template.yaml
+++ b/templates/gogs/gogs-persistent-template.yaml
@@ -6,6 +6,23 @@ metadata:
     tags: instant-app,gogs,go,golang
   name: gogs
 objects:
+- kind: ImageStream
+  apiVersion: v1
+  metadata:
+    labels:
+      app: ${APPLICATION_NAME}
+    name: ${APPLICATION_NAME}
+  spec:
+    tags:
+    - name: "${GOGS_VERSION}"
+      from:
+        kind: DockerImage
+        name: docker.io/makentenza/gogs:${GOGS_VERSION}
+      importPolicy: {}
+      annotations:
+        description: The Gogs git server docker image
+        tags: gogs,go,golang
+        version: "${GOGS_VERSION}"
 - kind: ServiceAccount
   apiVersion: v1
   metadata:
@@ -226,23 +243,6 @@ objects:
           kind: ImageStreamTag
           name: ${APPLICATION_NAME}:${GOGS_VERSION}
       type: ImageChange
-- kind: ImageStream
-  apiVersion: v1
-  metadata:
-    labels:
-      app: ${APPLICATION_NAME}
-    name: ${APPLICATION_NAME}
-  spec:
-    tags:
-    - name: "${GOGS_VERSION}"
-      from:
-        kind: DockerImage
-        name: docker.io/makentenza/gogs:${GOGS_VERSION}
-      importPolicy: {}
-      annotations:
-        description: The Gogs git server docker image
-        tags: gogs,go,golang
-        version: "${GOGS_VERSION}"
 - kind: PersistentVolumeClaim
   apiVersion: v1
   metadata:
diff --git a/templates/jenkins-s2i-build/template-with-secret.json b/templates/jenkins-s2i-build/template-with-secret.json
index bd6f99f1..bfb1980f 100644
--- a/templates/jenkins-s2i-build/template-with-secret.json
+++ b/templates/jenkins-s2i-build/template-with-secret.json
@@ -11,6 +11,37 @@
         }
     },
     "objects": [
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "${NAME}",
+                "annotations": {
+                    "description": "Keeps track of changes in the application image"
+                }
+            }
+        },
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "jenkins-2-rhel7"
+            },
+            "spec": {
+                "tags": [
+                    {
+                        "name": "latest",
+                        "annotations": {
+                            "openshift.io/imported-from": "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
+                        }
+                    }
+                ]
+            }
+        },
         {
             "kind": "BuildConfig",
             "apiVersion": "v1",
@@ -56,37 +87,6 @@
                     }
                 }
             }
-        },
-        {
-            "kind": "ImageStream",
-            "apiVersion": "v1",
-            "metadata": {
-                "name": "${NAME}",
-                "annotations": {
-                    "description": "Keeps track of changes in the application image"
-                }
-            }
-        },
-        {
-            "kind": "ImageStream",
-            "apiVersion": "v1",
-            "metadata": {
-                "name": "jenkins-2-rhel7"
-            },
-            "spec": {
-                "tags": [
-                    {
-                        "name": "latest",
-                        "annotations": {
-                            "openshift.io/imported-from": "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
-                        },
-                        "from": {
-                            "kind": "DockerImage",
-                            "name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
-                        }
-                    }
-                ]
-            }
         }
     ],
     "parameters": [
diff --git a/templates/jenkins-s2i-build/template.json b/templates/jenkins-s2i-build/template.json
index 6b9b8dea..2e96d534 100644
--- a/templates/jenkins-s2i-build/template.json
+++ b/templates/jenkins-s2i-build/template.json
@@ -11,6 +11,37 @@
         }
     },
     "objects": [
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "${NAME}",
+                "annotations": {
+                    "description": "Keeps track of changes in the application image"
+                }
+            }
+        },
+        {
+            "kind": "ImageStream",
+            "apiVersion": "v1",
+            "metadata": {
+                "name": "jenkins-2-rhel7"
+            },
+            "spec": {
+                "tags": [
+                    {
+                        "name": "latest",
+                        "annotations": {
+                            "openshift.io/imported-from": "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
+                        },
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
+                        }
+                    }
+                ]
+            }
+        },
         {
             "kind": "BuildConfig",
             "apiVersion": "v1",
@@ -53,37 +84,6 @@
                     }
                 }
             }
-        },
-        {
-            "kind": "ImageStream",
-            "apiVersion": "v1",
-            "metadata": {
-                "name": "${NAME}",
-                "annotations": {
-                    "description": "Keeps track of changes in the application image"
-                }
-            }
-        },
-        {
-            "kind": "ImageStream",
-            "apiVersion": "v1",
-            "metadata": {
-                "name": "jenkins-2-rhel7"
-            },
-            "spec": {
-                "tags": [
-                    {
-                        "name": "latest",
-                        "annotations": {
-                            "openshift.io/imported-from": "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
-                        },
-                        "from": {
-                            "kind": "DockerImage",
-                            "name": "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
-                        }
-                    }
-                ]
-            }
         }
     ],
     "parameters": [
diff --git a/templates/jenkins-slave-pod/template-with-secret.json b/templates/jenkins-slave-pod/template-with-secret.json
index b6882f7f..990ebd11 100644
--- a/templates/jenkins-slave-pod/template-with-secret.json
+++ b/templates/jenkins-slave-pod/template-with-secret.json
@@ -9,6 +9,32 @@
         }
     },
     "objects": [
+        {
+            "apiVersion": "v1",
+            "kind": "ImageStream",
+            "metadata": {
+                "labels": {
+                    "build": "${NAME}"
+                },
+                "name": "jenkins-slave-base-rhel7"
+            },
+            "spec": {
+                "tags": [
+                    {
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "openshift/jenkins-slave-base-rhel7:latest"
+                        },
+                        "generation": 2,
+                        "importPolicy": {},
+                        "name": "latest",
+                        "referencePolicy": {
+                            "type": "Source"
+                        }
+                    }
+                ]
+            }
+        },
         {
             "apiVersion": "v1",
             "kind": "BuildConfig",
@@ -75,32 +101,6 @@
                 },
                 "name": "${NAME}"
             }
-        },
-        {
-            "apiVersion": "v1",
-            "kind": "ImageStream",
-            "metadata": {
-                "labels": {
-                    "build": "${NAME}"
-                },
-                "name": "jenkins-slave-base-rhel7"
-            },
-            "spec": {
-                "tags": [
-                    {
-                        "from": {
-                            "kind": "DockerImage",
-                            "name": "openshift/jenkins-slave-base-rhel7:latest"
-                        },
-                        "generation": 2,
-                        "importPolicy": {},
-                        "name": "latest",
-                        "referencePolicy": {
-                            "type": "Source"
-                        }
-                    }
-                ]
-            }
         }
     ],
     "parameters": [
diff --git a/templates/jenkins-slave-pod/template.json b/templates/jenkins-slave-pod/template.json
index c9fa2440..4ce1fd8d 100644
--- a/templates/jenkins-slave-pod/template.json
+++ b/templates/jenkins-slave-pod/template.json
@@ -9,6 +9,43 @@
         }
     },
     "objects": [
+        {
+            "apiVersion": "v1",
+            "kind": "ImageStream",
+            "metadata": {
+                "labels": {
+                    "build": "${NAME}"
+                },
+                "name": "jenkins-slave-base-rhel7"
+            },
+            "spec": {
+                "tags": [
+                    {
+                        "from": {
+                            "kind": "DockerImage",
+                            "name": "openshift/jenkins-slave-base-rhel7:latest"
+                        },
+                        "generation": 2,
+                        "importPolicy": {},
+                        "name": "latest",
+                        "referencePolicy": {
+                            "type": "Source"
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "apiVersion": "v1",
+            "kind": "ImageStream",
+            "metadata": {
+                "labels": {
+                    "build": "${NAME}",
+                    "role": "jenkins-slave"
+                },
+                "name": "${NAME}"
+            }
+        },
         {
             "apiVersion": "v1",
             "kind": "BuildConfig",
@@ -61,43 +98,6 @@
                     }
                 ]
             }
-        },
-        {
-            "apiVersion": "v1",
-            "kind": "ImageStream",
-            "metadata": {
-                "labels": {
-                    "build": "${NAME}",
-                    "role": "jenkins-slave"
-                },
-                "name": "${NAME}"
-            }
-        },
-        {
-            "apiVersion": "v1",
-            "kind": "ImageStream",
-            "metadata": {
-                "labels": {
-                    "build": "${NAME}"
-                },
-                "name": "jenkins-slave-base-rhel7"
-            },
-            "spec": {
-                "tags": [
-                    {
-                        "from": {
-                            "kind": "DockerImage",
-                            "name": "openshift/jenkins-slave-base-rhel7:latest"
-                        },
-                        "generation": 2,
-                        "importPolicy": {},
-                        "name": "latest",
-                        "referencePolicy": {
-                            "type": "Source"
-                        }
-                    }
-                ]
-            }
         }
     ],
     "parameters": [
diff --git a/templates/nexus/template.json b/templates/nexus/template.json
index 7cbb1358..d0a8793e 100644
--- a/templates/nexus/template.json
+++ b/templates/nexus/template.json
@@ -14,6 +14,34 @@
     }
   },
   "objects": [
+    {
+      "apiVersion": "v1",
+      "kind": "ImageStream",
+      "metadata": {
+        "labels": {
+          "name": "${NAME}"
+        },
+        "name": "${NAME}"
+      },
+      "spec": {
+        "tags": [
+          {
+            "annotations": {
+              "openshift.io/imported-from": "${CONTAINER_IMAGE}"
+            },
+            "from": {
+              "kind": "DockerImage",
+              "name": "${CONTAINER_IMAGE}"
+            },
+            "importPolicy": {},
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Source"
+            }
+          }
+        ]
+      }
+    },
     {
       "kind": "PersistentVolumeClaim",
       "apiVersion": "v1",
@@ -152,34 +180,6 @@
         "type": "ClusterIP"
       }
     },
-    {
-      "apiVersion": "v1",
-      "kind": "ImageStream",
-      "metadata": {
-        "labels": {
-          "name": "${NAME}"
-        },
-        "name": "${NAME}"
-      },
-      "spec": {
-        "tags": [
-          {
-            "annotations": {
-              "openshift.io/imported-from": "${CONTAINER_IMAGE}"
-            },
-            "from": {
-              "kind": "DockerImage",
-              "name": "${CONTAINER_IMAGE}"
-            },
-            "importPolicy": {},
-            "name": "latest",
-            "referencePolicy": {
-              "type": "Source"
-            }
-          }
-        ]
-      }
-    },
     {
       "apiVersion": "v1",
       "kind": "Route",
diff --git a/templates/s2i-app-build/template-no-secrets.json b/templates/s2i-app-build/template-no-secrets.json
index b6b7214a..e0e2ef4f 100644
--- a/templates/s2i-app-build/template-no-secrets.json
+++ b/templates/s2i-app-build/template-no-secrets.json
@@ -11,6 +11,17 @@
         }
     },
     "objects": [
+        {
+            "apiVersion": "v1",
+            "kind": "ImageStream",
+            "metadata": {
+                "labels": {
+                    "build": "${NAME}"
+                },
+                "name": "${NAME}"
+            },
+            "spec": {}
+        },
         {
             "apiVersion": "v1",
             "kind": "BuildConfig",
@@ -86,17 +97,6 @@
             "status": {
                 "lastVersion": 1
             }
-        },
-        {
-            "apiVersion": "v1",
-            "kind": "ImageStream",
-            "metadata": {
-                "labels": {
-                    "build": "${NAME}"
-                },
-                "name": "${NAME}"
-            },
-            "spec": {}
         }
     ],
     "parameters": [
diff --git a/templates/s2i-app-build/template-with-secrets.json b/templates/s2i-app-build/template-with-secrets.json
index d0642c9b..303962ba 100644
--- a/templates/s2i-app-build/template-with-secrets.json
+++ b/templates/s2i-app-build/template-with-secrets.json
@@ -11,6 +11,17 @@
         }
     },
     "objects": [
+        {
+            "apiVersion": "v1",
+            "kind": "ImageStream",
+            "metadata": {
+                "labels": {
+                    "build": "${NAME}"
+                },
+                "name": "${NAME}"
+            },
+            "spec": {}
+        },
         {
             "apiVersion": "v1",
             "kind": "BuildConfig",
@@ -90,17 +101,6 @@
             "status": {
                 "lastVersion": 1
             }
-        },
-        {
-            "apiVersion": "v1",
-            "kind": "ImageStream",
-            "metadata": {
-                "labels": {
-                    "build": "${NAME}"
-                },
-                "name": "${NAME}"
-            },
-            "spec": {}
         }
     ],
     "parameters": [
diff --git a/templates/sonarqube-aws/template.json b/templates/sonarqube-aws/template.json
index 3aa84e87..3dee29dc 100644
--- a/templates/sonarqube-aws/template.json
+++ b/templates/sonarqube-aws/template.json
@@ -6,6 +6,79 @@
     "creationTimestamp": null
   },
   "objects": [
+    {
+      "apiVersion": "v1",
+      "kind": "ImageStream",
+      "metadata": {
+        "annotations": {
+          "openshift.io/generated-by": "OpenShiftNewApp"
+        },
+        "creationTimestamp": null,
+        "generation": 1,
+        "labels": {
+          "app": "sonarqube",
+          "appName": "sonarqube"
+        },
+        "name": "sonarqube"
+      },
+      "spec": {
+        "tags": [
+          {
+            "annotations": null,
+            "from": {
+              "kind": "DockerImage",
+              "name": "sonarqube:latest"
+            },
+            "generation": null,
+            "importPolicy": {},
+            "name": "latest",
+            "referencePolicy": {
+              "type": ""
+            }
+          }
+        ]
+      },
+      "status": {
+        "dockerImageRepository": ""
+      }
+    },
+    {
+      "apiVersion": "v1",
+      "kind": "ImageStream",
+      "metadata": {
+        "annotations": null,
+        "creationTimestamp": null,
+        "generation": 2,
+        "labels": {
+          "app": "sonarqube",
+          "appName": "sonarqube"
+        },
+        "name": "sonarqube"
+      },
+      "spec": {
+        "tags": [
+          {
+            "annotations": {
+              "openshift.io/generated-by": "OpenShiftWebConsole",
+              "openshift.io/imported-from": "sonarqube:latest"
+            },
+            "from": {
+              "kind": "DockerImage",
+              "name": "sonarqube:latest"
+            },
+            "generation": 2,
+            "importPolicy": {},
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Source"
+            }
+          }
+        ]
+      },
+      "status": {
+        "dockerImageRepository": ""
+      }
+    },
     {
       "apiVersion": "v1",
       "kind": "PersistentVolumeClaim",
@@ -240,80 +313,7 @@
         },
         "wildcardPolicy": "None"
       }
-    },
-    {
-      "apiVersion": "v1",
-      "kind": "ImageStream",
-      "metadata": {
-        "annotations": {
-          "openshift.io/generated-by": "OpenShiftNewApp"
-        },
-        "creationTimestamp": null,
-        "generation": 1,
-        "labels": {
-          "app": "sonarqube",
-          "appName": "sonarqube"
-        },
-        "name": "sonarqube"
-      },
-      "spec": {
-        "tags": [
-          {
-            "annotations": null,
-            "from": {
-              "kind": "DockerImage",
-              "name": "sonarqube:latest"
-            },
-            "generation": null,
-            "importPolicy": {},
-            "name": "latest",
-            "referencePolicy": {
-              "type": ""
-            }
-          }
-        ]
-      },
-      "status": {
-        "dockerImageRepository": ""
-      }
-    },
-    {
-      "apiVersion": "v1",
-      "kind": "ImageStream",
-      "metadata": {
-        "annotations": null,
-        "creationTimestamp": null,
-        "generation": 2,
-        "labels": {
-          "app": "sonarqube",
-          "appName": "sonarqube"
-        },
-        "name": "sonarqube"
-      },
-      "spec": {
-        "tags": [
-          {
-            "annotations": {
-              "openshift.io/generated-by": "OpenShiftWebConsole",
-              "openshift.io/imported-from": "sonarqube:latest"
-            },
-            "from": {
-              "kind": "DockerImage",
-              "name": "sonarqube:latest"
-            },
-            "generation": 2,
-            "importPolicy": {},
-            "name": "latest",
-            "referencePolicy": {
-              "type": "Source"
-            }
-          }
-        ]
-      },
-      "status": {
-        "dockerImageRepository": ""
-      }
-    },
+    }
     {
       "apiVersion": "v1",
       "kind": "Service",
diff --git a/templates/sonarqube/template.json b/templates/sonarqube/template.json
index 9c853b9c..623ab6eb 100644
--- a/templates/sonarqube/template.json
+++ b/templates/sonarqube/template.json
@@ -6,6 +6,79 @@
     "creationTimestamp": null
   },
   "objects": [
+    {
+      "apiVersion": "v1",
+      "kind": "ImageStream",
+      "metadata": {
+        "annotations": {
+          "openshift.io/generated-by": "OpenShiftNewApp"
+        },
+        "creationTimestamp": null,
+        "generation": 1,
+        "labels": {
+          "app": "openshift-sonarqube",
+          "appName": "sonarqube"
+        },
+        "name": "openshift-sonarqube"
+      },
+      "spec": {
+        "tags": [
+          {
+            "annotations": null,
+            "from": {
+              "kind": "DockerImage",
+              "name": "openshift-sonarqube:latest"
+            },
+            "generation": null,
+            "importPolicy": {},
+            "name": "latest",
+            "referencePolicy": {
+              "type": ""
+            }
+          }
+        ]
+      },
+      "status": {
+        "dockerImageRepository": ""
+      }
+    },
+    {
+      "apiVersion": "v1",
+      "kind": "ImageStream",
+      "metadata": {
+        "annotations": null,
+        "creationTimestamp": null,
+        "generation": 2,
+        "labels": {
+          "app": "sonarqube",
+          "appName": "sonarqube"
+        },
+        "name": "sonarqube"
+      },
+      "spec": {
+        "tags": [
+          {
+            "annotations": {
+              "openshift.io/generated-by": "OpenShiftWebConsole",
+              "openshift.io/imported-from": "sonarqube:latest"
+            },
+            "from": {
+              "kind": "DockerImage",
+              "name": "sonarqube:latest"
+            },
+            "generation": 2,
+            "importPolicy": {},
+            "name": "latest",
+            "referencePolicy": {
+              "type": "Source"
+            }
+          }
+        ]
+      },
+      "status": {
+        "dockerImageRepository": ""
+      }
+    },
     {
       "apiVersion": "v1",
       "kind": "PersistentVolumeClaim",
@@ -241,79 +314,6 @@
         "wildcardPolicy": "None"
       }
     },
-    {
-      "apiVersion": "v1",
-      "kind": "ImageStream",
-      "metadata": {
-        "annotations": {
-          "openshift.io/generated-by": "OpenShiftNewApp"
-        },
-        "creationTimestamp": null,
-        "generation": 1,
-        "labels": {
-          "app": "openshift-sonarqube",
-          "appName": "sonarqube"
-        },
-        "name": "openshift-sonarqube"
-      },
-      "spec": {
-        "tags": [
-          {
-            "annotations": null,
-            "from": {
-              "kind": "DockerImage",
-              "name": "openshift-sonarqube:latest"
-            },
-            "generation": null,
-            "importPolicy": {},
-            "name": "latest",
-            "referencePolicy": {
-              "type": ""
-            }
-          }
-        ]
-      },
-      "status": {
-        "dockerImageRepository": ""
-      }
-    },
-    {
-      "apiVersion": "v1",
-      "kind": "ImageStream",
-      "metadata": {
-        "annotations": null,
-        "creationTimestamp": null,
-        "generation": 2,
-        "labels": {
-          "app": "sonarqube",
-          "appName": "sonarqube"
-        },
-        "name": "sonarqube"
-      },
-      "spec": {
-        "tags": [
-          {
-            "annotations": {
-              "openshift.io/generated-by": "OpenShiftWebConsole",
-              "openshift.io/imported-from": "sonarqube:latest"
-            },
-            "from": {
-              "kind": "DockerImage",
-              "name": "sonarqube:latest"
-            },
-            "generation": 2,
-            "importPolicy": {},
-            "name": "latest",
-            "referencePolicy": {
-              "type": "Source"
-            }
-          }
-        ]
-      },
-      "status": {
-        "dockerImageRepository": ""
-      }
-    },
     {
       "apiVersion": "v1",
       "kind": "Service",