diff --git a/playbooks/openshift-apps/languages.yml b/playbooks/openshift-apps/languages.yml
index d7fab9131e..4b0bb1f6ac 100644
--- a/playbooks/openshift-apps/languages.yml
+++ b/playbooks/openshift-apps/languages.yml
@@ -16,9 +16,10 @@
     - darknao
     - jibecfed
 
-  - role: openshift/imagestream
+  - role: openshift/object
     app: languages
-    imagename: builder
+    objectname: imagestream.yml
+    template: imagestream.yml
 
   - role: openshift/object
     app: languages
diff --git a/roles/openshift-apps/languages/templates/cron.yml b/roles/openshift-apps/languages/templates/cron.yml
index 003e78ad3d..8d934251d6 100644
--- a/roles/openshift-apps/languages/templates/cron.yml
+++ b/roles/openshift-apps/languages/templates/cron.yml
@@ -231,7 +231,7 @@ spec:
         spec:
           restartPolicy: Never
           containers:
-          - image: allinurl/goaccess
+          - image: docker.io/allinurl/goaccess
             name: goaccess
             imagePullPolicy: IfNotPresent
             args:
diff --git a/roles/openshift-apps/languages/templates/deploymentconfig.yml b/roles/openshift-apps/languages/templates/deploymentconfig.yml
index 89ee07e6e4..c69b5e0d1a 100644
--- a/roles/openshift-apps/languages/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/languages/templates/deploymentconfig.yml
@@ -14,7 +14,7 @@ spec:
         app: "web"
     spec:
       containers:
-      - image: registry.redhat.io/rhel8/nginx-116
+      - image: registry.access.redhat.com/ubi8/nginx-118
         name: nginx
         imagePullPolicy: IfNotPresent
         args:
@@ -36,4 +36,13 @@ spec:
         persistentVolumeClaim:
           claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
       restartPolicy: Always
-
+  triggers:
+  - type: ConfigChange
+  - type: ImageChange
+    imageChangeParams:
+      automatic: true
+      from:
+        kind: ImageStreamTag
+        name: nginx:latest
+      containerNames:
+      - "nginx"
diff --git a/roles/openshift-apps/languages/templates/imagestream.yml b/roles/openshift-apps/languages/templates/imagestream.yml
new file mode 100644
index 0000000000..c3fa25477e
--- /dev/null
+++ b/roles/openshift-apps/languages/templates/imagestream.yml
@@ -0,0 +1,20 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: builder
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: nginx
+spec:
+  tags:
+  - from:
+      kind: DockerImage
+      name: registry.access.redhat.com/ubi8/nginx-118
+    importPolicy:
+      scheduled: true
+    name: latest
+    referencePolicy:
+      type: Source