diff --git a/deploy/aro/openshift-templates/infrastructure/mongo-db-deploy-template.yml b/deploy/aro/openshift-templates/infrastructure/mongo-db-deploy-template.yml
index f419b5176..0daca5968 100644
--- a/deploy/aro/openshift-templates/infrastructure/mongo-db-deploy-template.yml
+++ b/deploy/aro/openshift-templates/infrastructure/mongo-db-deploy-template.yml
@@ -96,6 +96,16 @@ objects:
   spec:
     lookupPolicy:
       local: false
+    tags:
+    - annotations:
+        openshift.io/imported-from: mongo
+      from:
+        kind: DockerImage
+        name: mongo
+      importPolicy: {}
+      name: latest
+      referencePolicy:
+        type: Source
 parameters:
 - description: The name for the application.
   displayName: Application Name
diff --git a/deploy/aro/openshift-templates/infrastructure/mssql-server-deploy-template.yml b/deploy/aro/openshift-templates/infrastructure/mssql-server-deploy-template.yml
index 132476228..ffe45f87e 100644
--- a/deploy/aro/openshift-templates/infrastructure/mssql-server-deploy-template.yml
+++ b/deploy/aro/openshift-templates/infrastructure/mssql-server-deploy-template.yml
@@ -117,6 +117,15 @@ objects:
   spec:
     lookupPolicy:
       local: false
+    tags:
+    - annotations: null
+      from:
+        kind: DockerImage
+        name: 'mcr.microsoft.com/mssql/server:2017-latest-ubuntu'
+      importPolicy: {}
+      name: latest
+      referencePolicy:
+        type: Source
 parameters:
 - description: The name for the application.
   displayName: Application Name
diff --git a/deploy/aro/openshift-templates/infrastructure/rabbitmq-deploy-template.yml b/deploy/aro/openshift-templates/infrastructure/rabbitmq-deploy-template.yml
index 067f06740..af3ab42ad 100644
--- a/deploy/aro/openshift-templates/infrastructure/rabbitmq-deploy-template.yml
+++ b/deploy/aro/openshift-templates/infrastructure/rabbitmq-deploy-template.yml
@@ -123,6 +123,16 @@ objects:
   spec:
     lookupPolicy:
       local: false
+    tags:
+    - annotations:
+        openshift.io/imported-from: 'rabbitmq:3-management-alpine'
+      from:
+        kind: DockerImage
+        name: 'rabbitmq:3-management-alpine'
+      importPolicy: {}
+      name: 3-management-alpine
+      referencePolicy:
+        type: Source
 parameters:
 - description: The name for the application.
   displayName: Application Name