diff --git a/playbooks/openshift-apps/resultsdb-ci-listener.yml b/playbooks/openshift-apps/resultsdb-ci-listener.yml
index f472797640..2853752b60 100644
--- a/playbooks/openshift-apps/resultsdb-ci-listener.yml
+++ b/playbooks/openshift-apps/resultsdb-ci-listener.yml
@@ -1,3 +1,6 @@
+#
+# ResultsDB CI Listener
+#
 ---
 - name: Make the app be real
   hosts: os_control[0]:os_control_stg[0]
@@ -35,6 +38,7 @@
         - vmaljulin
         - lrossett
         - kevin
+        - gwmngilfen
       tags:
         - apply-appowners
 
@@ -56,6 +60,15 @@
       secret_file_key: resultsdb-ci-listener.ca
       secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt"
 
+    - role: openshift/imagestream
+      imagestream_app: resultsdb-ci-listener
+      imagestream_imagename: resultsdb-ci-listener
+
+    - role: openshift/object
+      object_app: resultsdb-ci-listener
+      object_template: buildconfig.yml.j2
+      object_objectname: buildconfig.yml
+
     - role: openshift/object
       object_app: resultsdb-ci-listener
       object_template: secrets.yml.j2
diff --git a/roles/openshift-apps/resultsdb-ci-listener/files/imagestream.yml b/roles/openshift-apps/resultsdb-ci-listener/files/imagestream.yml
new file mode 100644
index 0000000000..72fb55e5e3
--- /dev/null
+++ b/roles/openshift-apps/resultsdb-ci-listener/files/imagestream.yml
@@ -0,0 +1,10 @@
+---
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: resultsdb-ci-listener
+spec:
+  lookupPolicy:
+    local: false
+status:
+  dockerImageRepository: ""
diff --git a/roles/openshift-apps/resultsdb-ci-listener/templates/buildconfig.yml.j2 b/roles/openshift-apps/resultsdb-ci-listener/templates/buildconfig.yml.j2
new file mode 100644
index 0000000000..53c4aaf760
--- /dev/null
+++ b/roles/openshift-apps/resultsdb-ci-listener/templates/buildconfig.yml.j2
@@ -0,0 +1,30 @@
+---
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: resultsdb-ci-listener
+  labels:
+    app: resultsdb-ci-listener
+    build: resultsdb-ci-listener
+spec:
+  output:
+    to:
+      kind: ImageStreamTag
+      name: resultsdb-ci-listener:latest
+  source:
+    type: Git
+    git:
+      # Using my fork for testing S2I builds, swap back after
+      # uri: https://pagure.io/ci-resultsdb-listener.git
+      uri: https://pagure.io/forks/gwmngilfen/ci-resultsdb-listener.git
+      ref: "{{ env }}"
+  strategy:
+    type: Source
+    sourceStrategy:
+      from:
+        kind: ImageStreamTag
+        namespace: openshift
+        name: python:3.11-ubi9
+  triggers:
+    - type: ConfigChange
+    - type: ImageChange