diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml
index 43cdfb2a02..9dc919702b 100644
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@@ -61,13 +61,6 @@
     template: imagestream.yml
     objectname: imagestream.yml
 
-  - role: openshift/object
-    app: greenwave
-    template: buildconfig.yml
-    objectname: buildconfig.yml
-    tags:
-      - apply-buildconfig
-
   - role: openshift/object
     app: greenwave
     template: configmap.yml
diff --git a/roles/openshift-apps/greenwave/templates/buildconfig.yml b/roles/openshift-apps/greenwave/templates/buildconfig.yml
deleted file mode 100644
index 80ec770af3..0000000000
--- a/roles/openshift-apps/greenwave/templates/buildconfig.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: v1
-kind: BuildConfig
-metadata:
-  name: "greenwave-docker-build"
-  labels:
-    environment: "greenwave"
-spec:
-  runPolicy: Serial
-  source:
-    dockerfile: |-
-      # See imagestream.yml for the definition
-      FROM greenwave-upstream:latest
-      USER 0
-      RUN dnf -y install fedora-messaging && dnf clean all
-      USER 1001
-  strategy:
-    type: Docker
-    dockerStrategy:
-      from:
-        kind: "ImageStreamTag"
-        name: "greenwave-upstream:latest"
-  triggers:
-      - type: ImageChange
-  output:
-    to:
-      kind: ImageStreamTag
-      name: greenwave:latest
diff --git a/roles/openshift-apps/greenwave/templates/deploymentconfig.yml b/roles/openshift-apps/greenwave/templates/deploymentconfig.yml
index c217bc29a7..f3a04d1ec3 100644
--- a/roles/openshift-apps/greenwave/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/greenwave/templates/deploymentconfig.yml
@@ -79,7 +79,11 @@ spec:
         image: registry/greenwave:latest
         ports:
         - containerPort: 8081
-        command: ["fedora-messaging", "consume"]
+        command:
+        - "/src/docker/docker-entrypoint.sh"
+        args:
+        - "fedora-messaging"
+        - "consume"
         volumeMounts:
         - name: config-volume
           mountPath: /etc/greenwave
diff --git a/roles/openshift-apps/greenwave/templates/imagestream.yml b/roles/openshift-apps/greenwave/templates/imagestream.yml
index 50609a4ba3..616358ae71 100644
--- a/roles/openshift-apps/greenwave/templates/imagestream.yml
+++ b/roles/openshift-apps/greenwave/templates/imagestream.yml
@@ -1,12 +1,8 @@
-apiVersion: v1
-kind: ImageStream
-metadata:
-  name: "greenwave"
 ---
 apiVersion: v1
 kind: ImageStream
 metadata:
-   name: "greenwave-upstream"
+  name: "greenwave"
 spec:
   tags:
   - name: latest