diff --git a/playbooks/openshift-apps/coreos-koji-tagger.yml b/playbooks/openshift-apps/coreos-koji-tagger.yml
new file mode 100644
index 0000000000..8726370660
--- /dev/null
+++ b/playbooks/openshift-apps/coreos-koji-tagger.yml
@@ -0,0 +1,49 @@
+- name: make the app be real
+  hosts: os_masters_stg[0]
+  user: root
+  gather_facts: False
+
+  vars_files:
+    - /srv/web/infra/ansible/vars/global.yml
+    - "/srv/private/ansible/vars.yml"
+    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  roles:
+  - role: openshift/project
+    app: coreos-koji-tagger
+    description: Tags builds into koji tags within Fedora's Koji instance
+    appowners:
+    - dustymabe
+    - jlebon
+    - mizdebsk
+
+  - role: openshift/keytab
+    app: coreos-koji-tagger
+    key: koji-keytab
+    secret_name: coreos-koji-tagger-coreos-bot-keytab
+    service: coreos-koji-tagger
+    host: "coreos-koji-tagger{{ env_suffix }}.fedoraproject.org"
+
+  - role: openshift/object
+    app: coreos-koji-tagger
+    template: imagestream.yml
+    objectname: imagestream.yml
+
+  - role: openshift/object
+    app: coreos-koji-tagger
+    template: buildconfig.yml
+    objectname: buildconfig.yml
+
+  - role: openshift/start-build
+    app: coreos-koji-tagger
+    buildname: coreos-koji-tagger-build
+    objectname: coreos-koji-tagger-build
+
+  - role: openshift/object
+    app: coreos-koji-tagger
+    template: deploymentconfig.yml
+    objectname: deploymentconfig.yml
+
+  - role: openshift/rollout
+    app: coreos-koji-tagger
+    dcname: coreos-koji-tagger
diff --git a/roles/openshift-apps/coreos-koji-tagger/templates/buildconfig.yml b/roles/openshift-apps/coreos-koji-tagger/templates/buildconfig.yml
new file mode 100644
index 0000000000..cb0fa3e2d0
--- /dev/null
+++ b/roles/openshift-apps/coreos-koji-tagger/templates/buildconfig.yml
@@ -0,0 +1,29 @@
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: coreos-koji-tagger-build
+  labels:
+    build: coreos-koji-tagger
+spec:
+  source:
+    git:
+      ref: master 
+      uri: https://github.com/coreos/coreos-koji-tagger.git
+    type: Git
+  strategy:
+    type: Docker
+    dockerStrategy:
+      from:
+        kind: ImageStreamTag
+        name: fedora:30
+  output:
+    to:
+      kind: ImageStreamTag
+      name: coreos-koji-tagger-img:latest
+  triggers:
+  - type: ConfigChange
+{% if coreos_koji_tagger_webhook_secret is defined %}
+  - type: Generic
+    generic:
+      secret: "{{ coreos_koji_tagger_webhook_secret }}"
+{% endif %}
diff --git a/roles/openshift-apps/coreos-koji-tagger/templates/deploymentconfig.yml b/roles/openshift-apps/coreos-koji-tagger/templates/deploymentconfig.yml
new file mode 100644
index 0000000000..e589666ce4
--- /dev/null
+++ b/roles/openshift-apps/coreos-koji-tagger/templates/deploymentconfig.yml
@@ -0,0 +1,53 @@
+apiVersion: apps.openshift.io/v1
+kind: DeploymentConfig
+metadata:
+  labels:
+    app: coreos-koji-tagger
+  name: coreos-koji-tagger
+spec:
+  replicas: 1
+  selector:
+    app: coreos-koji-tagger
+  strategy:
+    resources: {}
+  template:
+    metadata:
+      labels:
+        app: coreos-koji-tagger
+      name: coreos-koji-tagger
+    spec:
+      containers:
+      - env:
+#       - name: COREOS_KOJI_TAGGER_KEYTAB_FILE
+#         value: /etc/coreos-koji-tagger-coreos-bot-keytab
+        - name: COREOS_KOJI_TAGGER_USE_STG
+{% if env == "staging" %}
+          value: "true"
+{% else %}
+          value: "false"
+{% endif %}
+        volumeMounts:
+        - name: coreos-koji-tagger-coreos-bot-keytab-volume
+          mountPath: /etc/coreos-koji-tagger-coreos-bot-keytab
+          readOnly: true
+        image: ""
+        imagePullPolicy: IfNotPresent
+        name: coreos-koji-tagger
+        resources: {}
+      volumes:
+      - name: coreos-koji-tagger-coreos-bot-keytab-volume
+        secret:
+          secretName: coreos-koji-tagger-coreos-bot-keytab
+          optional: true
+      restartPolicy: Always
+  test: false
+  triggers:
+  - type: ConfigChange
+  - type: ImageChange
+    imageChangeParams:
+      automatic: true
+      containerNames:
+      - coreos-koji-tagger
+      from:
+        kind: ImageStreamTag
+        name: coreos-koji-tagger-img:latest
diff --git a/roles/openshift-apps/coreos-koji-tagger/templates/imagestream.yml b/roles/openshift-apps/coreos-koji-tagger/templates/imagestream.yml
new file mode 100644
index 0000000000..4cb07c260c
--- /dev/null
+++ b/roles/openshift-apps/coreos-koji-tagger/templates/imagestream.yml
@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: List
+items:
+# ImageStream for Fedora 30 image
+- apiVersion: image.openshift.io/v1
+  kind: ImageStream
+  metadata:
+    labels:
+      build: coreos-koji-tagger
+    name: fedora
+  spec:
+    lookupPolicy:
+      local: false
+    tags:
+    - name: "30"
+      from:
+        kind: DockerImage
+        name: registry.fedoraproject.org/fedora:30
+      importPolicy: 
+        scheduled: true
+      referencePolicy:
+        type: Source
+# ImageStream for resulting built coreos-koji-tagger-img
+- apiVersion: image.openshift.io/v1
+  kind: ImageStream
+  metadata:
+    labels:
+      build: coreos-koji-tagger
+    name: coreos-koji-tagger-img