diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml
index 85b78f9b23..f1b85bad3a 100644
--- a/playbooks/openshift-apps/waiverdb.yml
+++ b/playbooks/openshift-apps/waiverdb.yml
@@ -118,6 +118,17 @@
       object_template: deploymentconfig.yml.j2
       object_objectname: deploymentconfig.yml
 
+    # Remove no longer needed intermediate image build
+    - role: openshift/object-delete
+      object_delete_app: waiverdb
+      object_delete_objecttype: buildconfig
+      object_delete_objectname: waiverdb-docker-build
+
+    - role: openshift/object-delete
+      object_delete_app: waiverdb
+      object_delete_objecttype: imagestream
+      object_delete_objectname: waiverdb-upstream
+
     - role: openshift/rollout
       rollout_app: waiverdb
       rollout_dcname: waiverdb-web
diff --git a/roles/openshift-apps/waiverdb/templates/buildconfig.yml.j2 b/roles/openshift-apps/waiverdb/templates/buildconfig.yml.j2
deleted file mode 100644
index e12d7ac7a0..0000000000
--- a/roles/openshift-apps/waiverdb/templates/buildconfig.yml.j2
+++ /dev/null
@@ -1,25 +0,0 @@
----
-apiVersion: build.openshift.io/v1
-kind: BuildConfig
-metadata:
-  name: "waiverdb-docker-build"
-  labels:
-    environment: "waiverdb"
-spec:
-  runPolicy: Serial
-  source:
-    dockerfile: |-
-      # See imagestream.yml for the definition
-      FROM waiverdb-upstream:latest
-  strategy:
-    type: Docker
-    dockerStrategy:
-      from:
-        kind: "ImageStreamTag"
-        name: "waiverdb-upstream:latest"
-  triggers:
-    - type: ImageChange
-  output:
-    to:
-      kind: ImageStreamTag
-      name: waiverdb:latest
diff --git a/roles/openshift-apps/waiverdb/templates/imagestream.yml.j2 b/roles/openshift-apps/waiverdb/templates/imagestream.yml.j2
index d65d3b66bc..3600a57213 100644
--- a/roles/openshift-apps/waiverdb/templates/imagestream.yml.j2
+++ b/roles/openshift-apps/waiverdb/templates/imagestream.yml.j2
@@ -3,11 +3,6 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   name: "waiverdb"
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  name: "waiverdb-upstream"
 spec:
   tags:
   - name: latest