diff --git a/README.md b/README.md
index 201d1f7..de2e8c9 100755
--- a/README.md
+++ b/README.md
@@ -46,12 +46,12 @@ kubectl apply -f ./my-secret.yaml -n okd-coreos
 # run pipeline
 kubectl create \
 -n okd-coreos \
--f environments/kind/pipelineruns/okd-coreos-build-4.14-pipelinerun.yaml
+-f environments/kind/pipelineruns/okd-coreos-4.15-dev-pipelinerun.yaml
 
 # see the logs
 tkn pipelinerun logs -f \
 -n okd-coreos \
-okd-coreos-build-4.14-pipelinerun-fooba
+okd-coreos-4.15-dev-pipelinerun-fooba
 ```
 
 ### Sending pipeline status notifications to a Matrix channel
@@ -67,7 +67,7 @@ stringData:
   token: {OAuth token for the bot app}
 ```
 
-The pipeline run `environments/moc/pipelineruns/okd-coreos-all-4.*-pipelinerun.yaml` uses the following parameters:
+The pipeline run `environments/moc/pipelineruns/okd-coreos-4.*-prod-pipelinerun.yaml` uses the following parameters:
 * `matrix-room` : containing the matrix roomID where the notification will be sent
 * `matrix-endpoint`: URI of the matrix server hosting the room
 
@@ -87,11 +87,11 @@ kubectl get all -n okd-coreos
 # run pipeline
 kubectl create \
     -n okd-coreos \
-    -f environments/moc/pipelineruns/okd-coreos-all-4.14-pipelinerun.yaml
+    -f environments/moc/pipelineruns/okd-coreos-4.15-prod-pipelinerun.yaml
 
 # see the logs
 tkn pipelinerun logs -f \
     -n okd-coreos \
-    okd-coreos-all-4.14-pipelinerun-fooba
+    okd-coreos-4.15-prod-pipelinerun-fooba
 
 ```
diff --git a/base/batch/cronjobs/kustomization.yaml b/base/batch/cronjobs/kustomization.yaml
index ce116d4..0dc9d53 100644
--- a/base/batch/cronjobs/kustomization.yaml
+++ b/base/batch/cronjobs/kustomization.yaml
@@ -1,6 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - okd-coreos-all-4.13-create-daily.yaml
-  - okd-coreos-all-4.14-create-daily.yaml
+  - okd-coreos-4.13-prod-create-daily.yaml
+  - okd-coreos-4.14-prod-create-daily.yaml
+  - okd-coreos-4.15-prod-create-daily.yaml
   - tekton-cleanup-daily.yaml
diff --git a/base/batch/cronjobs/okd-coreos-all-4.13-create-daily.yaml b/base/batch/cronjobs/okd-coreos-4.13-prod-create-daily.yaml
similarity index 88%
rename from base/batch/cronjobs/okd-coreos-all-4.13-create-daily.yaml
rename to base/batch/cronjobs/okd-coreos-4.13-prod-create-daily.yaml
index f98f35b..8b95891 100644
--- a/base/batch/cronjobs/okd-coreos-all-4.13-create-daily.yaml
+++ b/base/batch/cronjobs/okd-coreos-4.13-prod-create-daily.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: okd-coreos-all-4.13-create-daily
+  name: okd-coreos-4.13-prod-create-daily
 spec:
   schedule: "0 6 * * *"
   jobTemplate:
@@ -37,9 +37,9 @@ spec:
               name: workspace
             env:
               - name: SINK_URL
-                value: "http://el-okd-coreos-all.okd-coreos.svc.cluster.local:8080"
+                value: "http://el-okd-coreos-prod.okd-coreos.svc.cluster.local:8080"
               - name: BRANCH
-                value: "release-4.13"
+                value: "release-4.14"
               - name: OKD_VERSION
                 value: "4.13"
               - name: RELEASE_STREAM
@@ -49,7 +49,7 @@ spec:
               - name: TAG_LATEST
                 value: "true"
               - name: CLAIMNAME
-                value: "pipeline-scos-stable-pvc"
+                value: "pipeline-scos-4.13-pvc"
             resources:
               limits:
                 cpu: 100m
diff --git a/base/batch/cronjobs/okd-coreos-all-4.14-create-daily.yaml b/base/batch/cronjobs/okd-coreos-4.14-prod-create-daily.yaml
similarity index 88%
rename from base/batch/cronjobs/okd-coreos-all-4.14-create-daily.yaml
rename to base/batch/cronjobs/okd-coreos-4.14-prod-create-daily.yaml
index 6a71c80..cfd2dac 100644
--- a/base/batch/cronjobs/okd-coreos-all-4.14-create-daily.yaml
+++ b/base/batch/cronjobs/okd-coreos-4.14-prod-create-daily.yaml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: okd-coreos-all-4.14-create-daily
+  name: okd-coreos-4.14-prod-create-daily
 spec:
   schedule: "30 7 * * *"
   jobTemplate:
@@ -37,9 +37,9 @@ spec:
               name: workspace
             env:
               - name: SINK_URL
-                value: "http://el-okd-coreos-all.okd-coreos.svc.cluster.local:8080"
+                value: "http://el-okd-coreos-prod.okd-coreos.svc.cluster.local:8080"
               - name: BRANCH
-                value: "master"
+                value: "release-4.14"
               - name: OKD_VERSION
                 value: "4.14"
               - name: RELEASE_STREAM
@@ -49,7 +49,7 @@ spec:
               - name: TAG_LATEST
                 value: "true"
               - name: CLAIMNAME
-                value: "pipeline-scos-next-pvc"
+                value: "pipeline-scos-4.14-pvc"
             resources:
               limits:
                 cpu: 100m
diff --git a/base/batch/cronjobs/okd-coreos-4.15-prod-create-daily.yaml b/base/batch/cronjobs/okd-coreos-4.15-prod-create-daily.yaml
new file mode 100644
index 0000000..a3090c5
--- /dev/null
+++ b/base/batch/cronjobs/okd-coreos-4.15-prod-create-daily.yaml
@@ -0,0 +1,58 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: okd-coreos-4.15-prod-create-daily
+spec:
+  schedule: "0 9 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          volumes:
+          - name: workspace
+            emptyDir: {}
+          containers:
+          - name: send-trigger
+            image: curlimages/curl
+            command:
+              - /bin/sh
+            args:
+              - -ce
+              - |
+                cat <<EOF > /workspace/post-body.json
+                {
+                  "params": {
+                    "branch": "${BRANCH}",
+                    "version": "${OKD_VERSION}",
+                    "release-stream": "${RELEASE_STREAM}",
+                    "rpm-artifacts-image": "${ARTIFACTS_IMAGE}",
+                    "tag-latest": "${TAG_LATEST}",
+                    "claimname": "${CLAIMNAME}"
+                  }
+                }
+                EOF
+                curl -d @/workspace/post-body.json $SINK_URL
+            volumeMounts:
+            - mountPath: /workspace
+              name: workspace
+            env:
+              - name: SINK_URL
+                value: "http://el-okd-coreos-prod.okd-coreos.svc.cluster.local:8080"
+              - name: BRANCH
+                value: "release-4.15"
+              - name: OKD_VERSION
+                value: "4.15"
+              - name: RELEASE_STREAM
+                value: "next"
+              - name: ARTIFACTS_IMAGE
+                value: "registry.ci.openshift.org/origin/4.15:artifacts"
+              - name: TAG_LATEST
+                value: "true"
+              - name: CLAIMNAME
+                value: "pipeline-scos-4.15-pvc"
+            resources:
+              limits:
+                cpu: 100m
+                memory: 128Mi
+          restartPolicy: Never
+          dnsPolicy: ClusterFirst
diff --git a/base/core/persistentvolumeclaims/kustomization.yaml b/base/core/persistentvolumeclaims/kustomization.yaml
index fcc4f4b..7abef66 100755
--- a/base/core/persistentvolumeclaims/kustomization.yaml
+++ b/base/core/persistentvolumeclaims/kustomization.yaml
@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - pvc-next.yaml
-  - pvc-stable.yaml
+  - pvc-4.13.yaml
+  - pvc-4.14.yaml
+  - pvc-4.15.yaml
diff --git a/base/core/persistentvolumeclaims/pvc-next.yaml b/base/core/persistentvolumeclaims/pvc-4.13.yaml
similarity index 84%
rename from base/core/persistentvolumeclaims/pvc-next.yaml
rename to base/core/persistentvolumeclaims/pvc-4.13.yaml
index a4f1a36..078bf51 100644
--- a/base/core/persistentvolumeclaims/pvc-next.yaml
+++ b/base/core/persistentvolumeclaims/pvc-4.13.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pipeline-scos-next-pvc
+  name: pipeline-scos-4.13-pvc
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/base/core/persistentvolumeclaims/pvc-stable.yaml b/base/core/persistentvolumeclaims/pvc-4.14.yaml
similarity index 83%
rename from base/core/persistentvolumeclaims/pvc-stable.yaml
rename to base/core/persistentvolumeclaims/pvc-4.14.yaml
index 5a18fcf..1192c0e 100644
--- a/base/core/persistentvolumeclaims/pvc-stable.yaml
+++ b/base/core/persistentvolumeclaims/pvc-4.14.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: pipeline-scos-stable-pvc
+  name: pipeline-scos-4.14-pvc
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/base/core/persistentvolumeclaims/pvc-4.15.yaml b/base/core/persistentvolumeclaims/pvc-4.15.yaml
new file mode 100644
index 0000000..5b7345b
--- /dev/null
+++ b/base/core/persistentvolumeclaims/pvc-4.15.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: pipeline-scos-4.15-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 40Gi
+  storageClassName: local
diff --git a/base/core/persistentvolumes/kustomization.yaml b/base/core/persistentvolumes/kustomization.yaml
index 8c176b6..c2105a3 100755
--- a/base/core/persistentvolumes/kustomization.yaml
+++ b/base/core/persistentvolumes/kustomization.yaml
@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - pv-next.yaml
-  - pv-stable.yaml
+  - pv-4.13.yaml
+  - pv-4.14.yaml
+  - pv-4.15.yaml
diff --git a/base/core/persistentvolumes/pv-next.yaml b/base/core/persistentvolumes/pv-4.13.yaml
similarity index 77%
rename from base/core/persistentvolumes/pv-next.yaml
rename to base/core/persistentvolumes/pv-4.13.yaml
index d646d45..470ef53 100644
--- a/base/core/persistentvolumes/pv-next.yaml
+++ b/base/core/persistentvolumes/pv-4.13.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pipeline-scos-next-pv
+  name: pipeline-scos-4.13-pv
 spec:
   capacity:
     storage: 40Gi
@@ -9,9 +9,12 @@ spec:
   accessModes:
   - ReadWriteOnce
   persistentVolumeReclaimPolicy: Delete
+  claimRef:
+    name: pipeline-scos-4.13-pvc
+    namespace: okd-coreos
   storageClassName: local
   local:
-    path: /tmp
+    path: /dev/sdb
   nodeAffinity:
     required:
       nodeSelectorTerms:
diff --git a/base/core/persistentvolumes/pv-stable.yaml b/base/core/persistentvolumes/pv-4.14.yaml
similarity index 77%
rename from base/core/persistentvolumes/pv-stable.yaml
rename to base/core/persistentvolumes/pv-4.14.yaml
index 3733191..12f6277 100644
--- a/base/core/persistentvolumes/pv-stable.yaml
+++ b/base/core/persistentvolumes/pv-4.14.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: pipeline-scos-stable-pv
+  name: pipeline-scos-4.14-pv
 spec:
   capacity:
     storage: 40Gi
@@ -9,9 +9,12 @@ spec:
   accessModes:
   - ReadWriteOnce
   persistentVolumeReclaimPolicy: Delete
+  claimRef:
+    name: pipeline-scos-4.14-pvc
+    namespace: okd-coreos
   storageClassName: local
   local:
-    path: /tmp
+    path: /dev/sdb
   nodeAffinity:
     required:
       nodeSelectorTerms:
diff --git a/base/core/persistentvolumes/pv-4.15.yaml b/base/core/persistentvolumes/pv-4.15.yaml
new file mode 100644
index 0000000..7188607
--- /dev/null
+++ b/base/core/persistentvolumes/pv-4.15.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: pipeline-scos-4.15-pv
+spec:
+  capacity:
+    storage: 40Gi
+  volumeMode: Filesystem
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Delete
+  claimRef:
+    name: pipeline-scos-4.15-pvc
+    namespace: okd-coreos
+  storageClassName: local
+  local:
+    path: /dev/sdb
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: kubernetes.io/hostname
+          operator: In
+          values:
+          - host-192-168-111-72
diff --git a/base/image.openshift.io/imagestreams/coreos-assembler/imagestream.yaml b/base/image.openshift.io/imagestreams/coreos-assembler/imagestream.yaml
new file mode 100644
index 0000000..bd4330e
--- /dev/null
+++ b/base/image.openshift.io/imagestreams/coreos-assembler/imagestream.yaml
@@ -0,0 +1,14 @@
+kind: ImageStream
+apiVersion: image.openshift.io/v1
+metadata:
+  name: coreos-assembler
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+    - name: "latest"
+      from:
+        kind: DockerImage
+        name: quay.io/coreos-assembler/coreos-assembler:latest
+      importPolicy:
+        scheduled: true
diff --git a/base/image.openshift.io/imagestreams/coreos-assembler/kustomization.yaml b/base/image.openshift.io/imagestreams/coreos-assembler/kustomization.yaml
new file mode 100644
index 0000000..98b5360
--- /dev/null
+++ b/base/image.openshift.io/imagestreams/coreos-assembler/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - imagestream.yaml
diff --git a/base/tekton.dev/pipelines/kustomization.yaml b/base/tekton.dev/pipelines/kustomization.yaml
index e9b24f7..4a1b17c 100755
--- a/base/tekton.dev/pipelines/kustomization.yaml
+++ b/base/tekton.dev/pipelines/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - okd-coreos-all.yaml
-  - okd-coreos-build.yaml
+  - okd-coreos.yaml
diff --git a/base/tekton.dev/pipelines/okd-coreos-build.yaml b/base/tekton.dev/pipelines/okd-coreos-build.yaml
deleted file mode 100644
index 20c32f1..0000000
--- a/base/tekton.dev/pipelines/okd-coreos-build.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: Pipeline
-metadata:
-  name: okd-coreos-build
-spec:
-  params:
-    - default: "https://github.com/openshift/os.git"
-      name: repo
-      type: string
-    - default: "master"
-      name: branch
-      type: string
-    - default: "scos"
-      name: variant
-      type: string
-    - default: "4.14"
-      name: version
-      type: string
-    - default: "registry.ci.openshift.org/origin/4.14:artifacts"
-      name: rpm-artifacts-image
-      type: string
-    - name: release-stream
-      default: "next"
-      type: string
-    - name: s3-bucket-name
-      default: ""
-      type: string
-    - name: s3-endpoint-url
-      default: ""
-      type: string
-    - name: s3-aws-config-file
-      default: ""
-      type: string
-  tasks:
-    - name: rpm-artifacts-copy
-      params:
-        - name: image
-          value: $(params.rpm-artifacts-image)
-      taskRef:
-        kind: Task
-        name: rpm-artifacts-copy
-      workspaces:
-        - name: ws
-          workspace: shared-workspace
-    - name: cosa-init
-      runAfter:
-        - rpm-artifacts-copy
-      params:
-        - name: repo
-          value: $(params.repo)
-        - name: branch
-          value: $(params.branch)
-        - name: variant
-          value: $(params.variant)
-        - name: version
-          value: $(params.version)
-      taskRef:
-        kind: Task
-        name: cosa-init
-      workspaces:
-        - name: ws
-          workspace: shared-workspace
-    - name: cosa-build-baseos
-      runAfter:
-        - cosa-init
-      params:
-        - name: release-stream
-          value: $(params.release-stream)
-        - name: bucket-name
-          value: $(params.s3-bucket-name)
-        - name: endpoint-url
-          value: $(params.s3-endpoint-url)
-        - name: aws-config-file
-          value: $(params.s3-aws-config-file)
-      taskRef:
-        kind: Task
-        name: cosa-build-baseos
-      workspaces:
-        - name: s3creds
-          workspace: s3-credentials
-        - name: ws
-          workspace: shared-workspace
-    - name: cosa-test
-      runAfter:
-        - cosa-build-baseos
-      params:
-        - name: variant
-          value: $(params.variant)
-      taskRef:
-        kind: Task
-        name: cosa-test
-      workspaces:
-        - name: ws
-          workspace: shared-workspace
-    - name: cosa-build-extensions
-      runAfter:
-        - cosa-test
-      params:
-        - name: variant
-          value: $(params.variant)
-      taskRef:
-        kind: Task
-        name: cosa-build-extensions
-      workspaces:
-        - name: ws
-          workspace: shared-workspace
-    - name: cosa-buildextend
-      runAfter:
-        - cosa-build-extensions
-      taskRef:
-        kind: Task
-        name: cosa-buildextend
-      workspaces:
-        - name: ws
-          workspace: shared-workspace 
-    - name: cosa-generate-release-meta
-      params:
-        - name: release-stream
-          value: $(params.release-stream)
-        - name: bucket-name
-          value: $(params.s3-bucket-name)
-        - name: endpoint-url
-          value: $(params.s3-endpoint-url)
-      runAfter:
-        - cosa-buildextend
-      taskRef:
-        kind: Task
-        name: cosa-generate-release-meta
-      workspaces:
-        - name: ws
-          workspace: shared-workspace 
-  workspaces:
-    - name: shared-workspace
-    - name: s3-credentials
diff --git a/base/tekton.dev/pipelines/okd-coreos-all.yaml b/base/tekton.dev/pipelines/okd-coreos.yaml
similarity index 99%
rename from base/tekton.dev/pipelines/okd-coreos-all.yaml
rename to base/tekton.dev/pipelines/okd-coreos.yaml
index b5223ef..1d5ebf6 100644
--- a/base/tekton.dev/pipelines/okd-coreos-all.yaml
+++ b/base/tekton.dev/pipelines/okd-coreos.yaml
@@ -1,7 +1,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: Pipeline
 metadata:
-  name: okd-coreos-all
+  name: okd-coreos
 spec:
   params:
     - default: "https://github.com/openshift/os.git"
@@ -104,6 +104,7 @@ spec:
           value: $(params.s3-endpoint-url)
         - name: aws-config-file
           value: $(params.s3-aws-config-file)
+      timeout: 1h30m0s
       workspaces:
         - name: s3creds
           workspace: s3-credentials
diff --git a/base/tekton.dev/tasks/cosa-build-baseos.yaml b/base/tekton.dev/tasks/cosa-build-baseos.yaml
index fee9fd3..cc28dbd 100644
--- a/base/tekton.dev/tasks/cosa-build-baseos.yaml
+++ b/base/tekton.dev/tasks/cosa-build-baseos.yaml
@@ -32,7 +32,7 @@ spec:
         #!/usr/bin/env bash
         set -euxo pipefail
 
-        cd /srv/coreos
+        cd /workspace/coreos
 
         if [[ -z "$(params.endpoint-url)" || ! -f "$(workspaces.s3creds.path)/$(params.aws-config-file)" || -z "$(params.bucket-name)" || -z "$(params.release-stream)" ]]; then
           echo "Skipping buildfetch from S3 - bucket params not set"
@@ -42,9 +42,9 @@ spec:
           --aws-config-file=$(workspaces.s3creds.path)/$(params.aws-config-file)
         fi
         cosa fetch
-        cosa build ostree --force-nocache
+        cosa build container --force-nocache
 
   workspaces:
-    - mountPath: /srv
+    - mountPath: /workspace
       name: ws
     - name: s3creds
diff --git a/base/tekton.dev/tasks/cosa-init.yaml b/base/tekton.dev/tasks/cosa-init.yaml
index f86b8a1..df6165f 100644
--- a/base/tekton.dev/tasks/cosa-init.yaml
+++ b/base/tekton.dev/tasks/cosa-init.yaml
@@ -30,8 +30,8 @@ spec:
         #!/usr/bin/env bash
         set -euxo pipefail
 
-        mkdir -p /srv/coreos
-        cd /srv/coreos
+        mkdir -p /workspace/coreos
+        cd /workspace/coreos
 
         cat << INFO
         Initializing coreos-assembler:
@@ -50,9 +50,9 @@ spec:
             $(params.repo)
 
         # Move rpms into scope of COSA VM
-        if [ -d "/srv/rpms" ]; then
-          cp -r /srv/rpms /srv/coreos/
-          createrepo_c /srv/coreos/rpms
+        if [ -d "/workspace/rpms" ]; then
+          cp -r /workspace/rpms /workspace/coreos/
+          createrepo_c /workspace/coreos/rpms
         fi
 
         # TODO: Upstream to openshift/os
@@ -63,7 +63,7 @@ spec:
 
         [artifacts]
         name=OKD RPM artifacts
-        baseurl=file:///srv/coreos/rpms/
+        baseurl=file:///workspace/coreos/rpms/
         repo_gpgcheck=0
         gpgcheck=0
         enabled=1
@@ -71,5 +71,5 @@ spec:
         EOF
 
   workspaces:
-    - mountPath: /srv
+    - mountPath: /workspace
       name: ws
diff --git a/base/tekton.dev/tasks/rpm-artifacts-copy.yaml b/base/tekton.dev/tasks/rpm-artifacts-copy.yaml
index 4dae6fc..2ecc098 100644
--- a/base/tekton.dev/tasks/rpm-artifacts-copy.yaml
+++ b/base/tekton.dev/tasks/rpm-artifacts-copy.yaml
@@ -18,6 +18,7 @@ spec:
         rm -rf /workspace/*
         mkdir /workspace/rpms
         cp -irvf /srv/repo/*.rpm /workspace/rpms/
+        chmod 0777 /workspace
         chmod 0777 /workspace/rpms/
         chmod 0666 /workspace/rpms/*.rpm
 
diff --git a/base/triggers.tekton.dev/eventlisteners/kustomization.yaml b/base/triggers.tekton.dev/eventlisteners/kustomization.yaml
index 75d5c3e..5e37d47 100644
--- a/base/triggers.tekton.dev/eventlisteners/kustomization.yaml
+++ b/base/triggers.tekton.dev/eventlisteners/kustomization.yaml
@@ -1,5 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - okd-coreos-all.yaml
+  - okd-coreos-prod.yaml
   - tekton-cleanup.yaml
diff --git a/base/triggers.tekton.dev/eventlisteners/okd-coreos-all.yaml b/base/triggers.tekton.dev/eventlisteners/okd-coreos-prod.yaml
similarity index 55%
rename from base/triggers.tekton.dev/eventlisteners/okd-coreos-all.yaml
rename to base/triggers.tekton.dev/eventlisteners/okd-coreos-prod.yaml
index 14d4ee1..19dd038 100644
--- a/base/triggers.tekton.dev/eventlisteners/okd-coreos-all.yaml
+++ b/base/triggers.tekton.dev/eventlisteners/okd-coreos-prod.yaml
@@ -1,12 +1,12 @@
 apiVersion: triggers.tekton.dev/v1beta1
 kind: EventListener
 metadata:
-  name: okd-coreos-all
+  name: okd-coreos-prod
 spec:
   serviceAccountName: pipeline
   triggers:
-    - name: okd-coreos-all-trigger
+    - name: okd-coreos-prod-trigger
       bindings:
-        - ref: okd-coreos-all
+        - ref: okd-coreos-prod
       template:
-        ref: okd-coreos-all
+        ref: okd-coreos-prod
diff --git a/base/triggers.tekton.dev/triggerbindings/kustomization.yaml b/base/triggers.tekton.dev/triggerbindings/kustomization.yaml
index 75d5c3e..5e37d47 100644
--- a/base/triggers.tekton.dev/triggerbindings/kustomization.yaml
+++ b/base/triggers.tekton.dev/triggerbindings/kustomization.yaml
@@ -1,5 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - okd-coreos-all.yaml
+  - okd-coreos-prod.yaml
   - tekton-cleanup.yaml
diff --git a/base/triggers.tekton.dev/triggerbindings/okd-coreos-all.yaml b/base/triggers.tekton.dev/triggerbindings/okd-coreos-prod.yaml
similarity index 94%
rename from base/triggers.tekton.dev/triggerbindings/okd-coreos-all.yaml
rename to base/triggers.tekton.dev/triggerbindings/okd-coreos-prod.yaml
index 418fba7..b84bf0b 100644
--- a/base/triggers.tekton.dev/triggerbindings/okd-coreos-all.yaml
+++ b/base/triggers.tekton.dev/triggerbindings/okd-coreos-prod.yaml
@@ -1,7 +1,7 @@
 apiVersion: triggers.tekton.dev/v1beta1
 kind: TriggerBinding
 metadata:
-  name: okd-coreos-all
+  name: okd-coreos-prod
 spec:
   params:
   - name: branch
diff --git a/base/triggers.tekton.dev/triggertemplates/kustomization.yaml b/base/triggers.tekton.dev/triggertemplates/kustomization.yaml
index 75d5c3e..5e37d47 100644
--- a/base/triggers.tekton.dev/triggertemplates/kustomization.yaml
+++ b/base/triggers.tekton.dev/triggertemplates/kustomization.yaml
@@ -1,5 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - okd-coreos-all.yaml
+  - okd-coreos-prod.yaml
   - tekton-cleanup.yaml
diff --git a/base/triggers.tekton.dev/triggertemplates/okd-coreos-all.yaml b/base/triggers.tekton.dev/triggertemplates/okd-coreos-prod.yaml
similarity index 95%
rename from base/triggers.tekton.dev/triggertemplates/okd-coreos-all.yaml
rename to base/triggers.tekton.dev/triggertemplates/okd-coreos-prod.yaml
index 60083c3..31171aa 100644
--- a/base/triggers.tekton.dev/triggertemplates/okd-coreos-all.yaml
+++ b/base/triggers.tekton.dev/triggertemplates/okd-coreos-prod.yaml
@@ -1,7 +1,7 @@
 apiVersion: triggers.tekton.dev/v1beta1
 kind: TriggerTemplate
 metadata:
-  name: okd-coreos-all
+  name: okd-coreos-prod
 spec:
   params:
   - name: repo
@@ -41,12 +41,12 @@ spec:
   - name: matrix-endpoint
     default: 'matrix.org'
   - name: claimname
-    default: 'pipeline-scos-stable-pvc'
+    default: 'pipeline-scos-4.13-pvc'
   resourcetemplates:
   - apiVersion: tekton.dev/v1beta1
     kind: PipelineRun
     metadata:
-      generateName: okd-coreos-all-$(tt.params.version)-pipelinerun-
+      generateName: okd-coreos-$(tt.params.version)-prod-pipelinerun-
       annotations:
         operator.tekton.dev/prune.skip: "false"
         operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
@@ -94,7 +94,7 @@ spec:
         - name: claimname
           value: $(tt.params.claimname)
       pipelineRef:
-        name: okd-coreos-all
+        name: okd-coreos
       timeouts:
         pipeline: "4h0m0s"
       workspaces:
diff --git a/environments/kind/pipelineruns/okd-coreos-all-4.13-pipelinerun.yaml b/environments/kind/pipelineruns/okd-coreos-4.13-dev-pipelinerun.yaml
similarity index 95%
rename from environments/kind/pipelineruns/okd-coreos-all-4.13-pipelinerun.yaml
rename to environments/kind/pipelineruns/okd-coreos-4.13-dev-pipelinerun.yaml
index 5b3b177..fb6e9c8 100644
--- a/environments/kind/pipelineruns/okd-coreos-all-4.13-pipelinerun.yaml
+++ b/environments/kind/pipelineruns/okd-coreos-4.13-dev-pipelinerun.yaml
@@ -1,7 +1,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  generateName: okd-coreos-all-4.13-pipelinerun-
+  generateName: okd-coreos-4.13-dev-pipelinerun-
   annotations:
     operator.tekton.dev/prune.skip: "false"
     operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
@@ -44,7 +44,7 @@ spec:
     - name: notify-matrix
       value: "false"
   pipelineRef:
-    name: okd-coreos-all
+    name: okd-coreos
   timeouts:
     pipeline: "4h0m0s"
   workspaces:
diff --git a/environments/kind/pipelineruns/okd-coreos-all-4.14-pipelinerun.yaml b/environments/kind/pipelineruns/okd-coreos-4.14-dev-pipelinerun.yaml
similarity index 94%
rename from environments/kind/pipelineruns/okd-coreos-all-4.14-pipelinerun.yaml
rename to environments/kind/pipelineruns/okd-coreos-4.14-dev-pipelinerun.yaml
index fc15a93..3de4792 100644
--- a/environments/kind/pipelineruns/okd-coreos-all-4.14-pipelinerun.yaml
+++ b/environments/kind/pipelineruns/okd-coreos-4.14-dev-pipelinerun.yaml
@@ -1,7 +1,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  generateName: okd-coreos-all-4.14-pipelinerun-
+  generateName: okd-coreos-4.14-dev-pipelinerun-
   annotations:
     operator.tekton.dev/prune.skip: "false"
     operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
@@ -12,7 +12,7 @@ spec:
     - name: repo
       value: "https://github.com/openshift/os.git"
     - name: branch
-      value: "master"
+      value: "release-4.14"
     - name: variant
       value: "scos"     
     - name: version
@@ -44,7 +44,7 @@ spec:
     - name: notify-matrix
       value: "false"
   pipelineRef:
-    name: okd-coreos-all
+    name: okd-coreos
   timeouts:
     pipeline: "4h0m0s"
   workspaces:
diff --git a/environments/kind/pipelineruns/okd-coreos-4.15-dev-pipelinerun.yaml b/environments/kind/pipelineruns/okd-coreos-4.15-dev-pipelinerun.yaml
new file mode 100644
index 0000000..916f994
--- /dev/null
+++ b/environments/kind/pipelineruns/okd-coreos-4.15-dev-pipelinerun.yaml
@@ -0,0 +1,63 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  generateName: okd-coreos-4.15-dev-pipelinerun-
+  annotations:
+    operator.tekton.dev/prune.skip: "false"
+    operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
+    operator.tekton.dev/prune.keep: "1"
+    operator.tekton.dev/prune.strategy: "keep"
+spec:
+  params:
+    - name: repo
+      value: "https://github.com/openshift/os.git"
+    - name: branch
+      value: "release-4.15"
+    - name: variant
+      value: "scos"     
+    - name: version
+      value: "4.15"
+    - name: release-stream
+      value: "next"
+    - name: rpm-artifacts-image
+      value: "registry.ci.openshift.org/origin/4.15:artifacts"
+    - name: target-registry
+      value: "quay.io/okd"
+    - name: baseos-container-image-name
+      value: "centos-stream-coreos-9"
+    - name: extensions-container-image-name
+      value: "centos-stream-coreos-9-extensions"
+    - name: s3-bucket-name
+      value: "okd-scos"
+    - name: s3-endpoint-url
+      value: "https://okd-scos.s3.amazonaws.com/"
+    - name: matrix-room
+      value: ""
+    - name: matrix-endpoint
+      value: ""
+    - name: upload-container-images
+      value: "false"
+    - name: tag-latest
+      value: "false"
+    - name: upload-bootimages
+      value: "false"
+    - name: notify-matrix
+      value: "false"
+  pipelineRef:
+    name: okd-coreos
+  timeouts:
+    pipeline: "4h0m0s"
+  workspaces:
+    - name: registry-credentials
+      secret:
+        secretName: my-secret
+    - name: s3-credentials
+      emptyDir: {}
+    - name: shared-workspace
+      volumeClaimTemplate:
+        spec:
+          accessModes: 
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 40Gi
diff --git a/environments/kind/pipelineruns/okd-coreos-build-4.13-pipelinerun.yaml b/environments/kind/pipelineruns/okd-coreos-build-4.13-pipelinerun.yaml
deleted file mode 100644
index 985900c..0000000
--- a/environments/kind/pipelineruns/okd-coreos-build-4.13-pipelinerun.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  generateName: okd-coreos-build-4.13-pipelinerun-
-  annotations:
-    operator.tekton.dev/prune.skip: "false"
-    operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
-    operator.tekton.dev/prune.keep: "1"
-    operator.tekton.dev/prune.strategy: "keep"
-spec:
-  params:
-    - name: repo
-      value: "https://github.com/openshift/os.git"
-    - name: branch
-      value: "release-4.13"
-    - name: variant
-      value: "scos"     
-    - name: version
-      value: "4.13"
-    - name: release-stream
-      value: "stable"
-    - name: rpm-artifacts-image
-      value: "registry.ci.openshift.org/origin/4.13:artifacts"
-  pipelineRef:
-    name: okd-coreos-build
-  workspaces:
-    - name: s3-credentials
-      emptyDir: {}
-    - name: shared-workspace
-      volumeClaimTemplate:
-        spec:
-          accessModes: 
-            - ReadWriteOnce
-          resources:
-            requests:
-              storage: 20Gi
diff --git a/environments/kind/pipelineruns/okd-coreos-build-4.14-pipelinerun.yaml b/environments/kind/pipelineruns/okd-coreos-build-4.14-pipelinerun.yaml
deleted file mode 100644
index 94760c6..0000000
--- a/environments/kind/pipelineruns/okd-coreos-build-4.14-pipelinerun.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  generateName: okd-coreos-build-4.14-pipelinerun-
-  annotations:
-    operator.tekton.dev/prune.skip: "false"
-    operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
-    operator.tekton.dev/prune.keep: "1"
-    operator.tekton.dev/prune.strategy: "keep"
-spec:
-  params:
-    - name: repo
-      value: "https://github.com/openshift/os.git"
-    - name: branch
-      value: "master"
-    - name: variant
-      value: "scos"     
-    - name: version
-      value: "4.14"
-    - name: release-stream
-      value: "next"
-    - name: rpm-artifacts-image
-      value: "registry.ci.openshift.org/origin/4.14:artifacts"
-  pipelineRef:
-    name: okd-coreos-build
-  workspaces:
-    - name: s3-credentials
-      emptyDir: {}
-    - name: shared-workspace
-      volumeClaimTemplate:
-        spec:
-          accessModes: 
-            - ReadWriteOnce
-          resources:
-            requests:
-              storage: 20Gi
diff --git a/environments/moc/pipelineruns/okd-coreos-all-4.13-pipelinerun.yaml b/environments/moc/pipelineruns/okd-coreos-4.13-prod-pipelinerun.yaml
similarity index 89%
rename from environments/moc/pipelineruns/okd-coreos-all-4.13-pipelinerun.yaml
rename to environments/moc/pipelineruns/okd-coreos-4.13-prod-pipelinerun.yaml
index 8f6c901..33e2891 100644
--- a/environments/moc/pipelineruns/okd-coreos-all-4.13-pipelinerun.yaml
+++ b/environments/moc/pipelineruns/okd-coreos-4.13-prod-pipelinerun.yaml
@@ -1,7 +1,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  generateName: okd-coreos-all-4.13-pipelinerun-
+  generateName: okd-coreos-4.13-prod-pipelinerun-
   annotations:
     operator.tekton.dev/prune.skip: "false"
     operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
@@ -29,7 +29,6 @@ spec:
       value: "okd-scos"
     - name: s3-endpoint-url
       value: "https://okd-scos.s3.amazonaws.com/"
-    # TODO Update with values for OKD WG
     - name: matrix-room
       value: "!nStsazaBvZCZQHPWTY:fedoraproject.org"
     - name: matrix-endpoint
@@ -43,12 +42,12 @@ spec:
     - name: notify-matrix
       value: "true"
     - name: claimname
-      value: pipeline-scos-stable-pvc
+      value: pipeline-scos-4.13-pvc
   podTemplate:
     nodeSelector:
        kubernetes.io/hostname: host-192-168-111-83
   pipelineRef:
-    name: okd-coreos-all
+    name: okd-coreos
   timeouts:
     pipeline: "4h0m0s"
   workspaces:
@@ -60,4 +59,4 @@ spec:
         secretName: okd-s3-config
     - name: shared-workspace
       persistentVolumeClaim:
-        claimName: pipeline-scos-stable-pvc
+        claimName: pipeline-scos-4.13-pvc
diff --git a/environments/moc/pipelineruns/okd-coreos-all-4.14-pipelinerun.yaml b/environments/moc/pipelineruns/okd-coreos-4.14-prod-pipelinerun.yaml
similarity index 90%
rename from environments/moc/pipelineruns/okd-coreos-all-4.14-pipelinerun.yaml
rename to environments/moc/pipelineruns/okd-coreos-4.14-prod-pipelinerun.yaml
index 6de1166..39eec1d 100644
--- a/environments/moc/pipelineruns/okd-coreos-all-4.14-pipelinerun.yaml
+++ b/environments/moc/pipelineruns/okd-coreos-4.14-prod-pipelinerun.yaml
@@ -1,7 +1,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  generateName: okd-coreos-all-4.14-pipelinerun-
+  generateName: okd-coreos-4.14-prod-pipelinerun-
   annotations:
     operator.tekton.dev/prune.skip: "false"
     operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
@@ -12,7 +12,7 @@ spec:
     - name: repo
       value: "https://github.com/openshift/os.git"
     - name: branch
-      value: "master"
+      value: "release-4.14"
     - name: variant
       value: "scos"     
     - name: version
@@ -42,12 +42,12 @@ spec:
     - name: notify-matrix
       value: "true"
     - name: claimname
-      value: pipeline-scos-next-pvc
+      value: pipeline-scos-4.14-pvc
   podTemplate:
     nodeSelector:
       kubernetes.io/hostname: host-192-168-111-83
   pipelineRef:
-    name: okd-coreos-all
+    name: okd-coreos
   timeouts:
     pipeline: "4h0m0s"
   workspaces:
@@ -59,4 +59,4 @@ spec:
         secretName: okd-s3-config
     - name: shared-workspace
       persistentVolumeClaim:
-        claimName: pipeline-scos-next-pvc
+        claimName: pipeline-scos-4.14-pvc
diff --git a/environments/moc/pipelineruns/okd-coreos-build-4.13-pipelinerun.yaml b/environments/moc/pipelineruns/okd-coreos-4.15-prod-pipelinerun.yaml
similarity index 73%
rename from environments/moc/pipelineruns/okd-coreos-build-4.13-pipelinerun.yaml
rename to environments/moc/pipelineruns/okd-coreos-4.15-prod-pipelinerun.yaml
index 4bde515..819664b 100644
--- a/environments/moc/pipelineruns/okd-coreos-build-4.13-pipelinerun.yaml
+++ b/environments/moc/pipelineruns/okd-coreos-4.15-prod-pipelinerun.yaml
@@ -1,7 +1,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  generateName: okd-coreos-build-4.13-pipelinerun-
+  generateName: okd-coreos-4.15-prod-pipelinerun-
   annotations:
     operator.tekton.dev/prune.skip: "false"
     operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
@@ -12,37 +12,42 @@ spec:
     - name: repo
       value: "https://github.com/openshift/os.git"
     - name: branch
-      value: "release-4.13"
+      value: "release-4.15"
     - name: variant
       value: "scos"     
     - name: version
-      value: "4.13"
+      value: "4.15"
     - name: rpm-artifacts-image
-      value: "registry.ci.openshift.org/origin/4.13:artifacts"
+      value: "registry.ci.openshift.org/origin/4.15:artifacts"
     - name: target-registry
       value: "quay.io/okd"
     - name: baseos-container-image-name
       value: "centos-stream-coreos-9"
     - name: extensions-container-image-name
       value: "centos-stream-coreos-9-extensions"
-    - name: tag-latest
-      value: "false"
     - name: s3-bucket-name
       value: "okd-scos"
     - name: s3-endpoint-url
       value: "https://okd-scos.s3.amazonaws.com/"
-    # TODO Update with values for OKD WG
     - name: matrix-room
       value: "!nStsazaBvZCZQHPWTY:fedoraproject.org"
     - name: matrix-endpoint
       value: 'matrix.org'
+    - name: upload-container-images
+      value: "true"
+    - name: tag-latest
+      value: "true"
+    - name: upload-bootimages
+      value: "true"
+    - name: notify-matrix
+      value: "true"
     - name: claimname
-      value: pipeline-scos-stable-pvc
+      value: pipeline-scos-4.15-pvc
   podTemplate:
     nodeSelector:
-       kubernetes.io/hostname: host-192-168-111-83
+      kubernetes.io/hostname: host-192-168-111-72
   pipelineRef:
-    name: okd-coreos-build
+    name: okd-coreos
   timeouts:
     pipeline: "4h0m0s"
   workspaces:
@@ -54,4 +59,4 @@ spec:
         secretName: okd-s3-config
     - name: shared-workspace
       persistentVolumeClaim:
-        claimName: pipeline-scos-stable-pvc
+        claimName: pipeline-scos-4.15-pvc
diff --git a/environments/moc/pipelineruns/okd-coreos-build-4.14-pipelinerun.yaml b/environments/moc/pipelineruns/okd-coreos-build-4.14-pipelinerun.yaml
deleted file mode 100644
index e9e3e5a..0000000
--- a/environments/moc/pipelineruns/okd-coreos-build-4.14-pipelinerun.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-apiVersion: tekton.dev/v1beta1
-kind: PipelineRun
-metadata:
-  generateName: okd-coreos-build-4.14-pipelinerun-
-  annotations:
-    operator.tekton.dev/prune.skip: "false"
-    operator.tekton.dev/prune.resources: "taskrun, pipelinerun"
-    operator.tekton.dev/prune.keep: "1"
-    operator.tekton.dev/prune.strategy: "keep"
-spec:
-  params:
-    - name: repo
-      value: "https://github.com/openshift/os.git"
-    - name: branch
-      value: "master"
-    - name: variant
-      value: "scos"     
-    - name: version
-      value: "4.14"
-    - name: rpm-artifacts-image
-      value: "registry.ci.openshift.org/origin/4.14:artifacts"
-    - name: target-registry
-      value: "quay.io/okd"
-    - name: baseos-container-image-name
-      value: "centos-stream-coreos-9"
-    - name: extensions-container-image-name
-      value: "centos-stream-coreos-9-extensions"
-    - name: tag-latest
-      value: "false"
-    - name: s3-bucket-name
-      value: "okd-scos"
-    - name: s3-endpoint-url
-      value: "https://okd-scos.s3.amazonaws.com/"
-    - name: matrix-room
-      value: "!nStsazaBvZCZQHPWTY:fedoraproject.org"
-    - name: matrix-endpoint
-      value: 'matrix.org'
-    - name: claimname
-      value: pipeline-scos-next-pvc
-  podTemplate:
-    nodeSelector:
-      kubernetes.io/hostname: host-192-168-111-83
-  pipelineRef:
-    name: okd-coreos-build
-  timeouts:
-    pipeline: "4h0m0s"
-  workspaces:
-    - name: registry-credentials
-      secret:
-        secretName: okd-quay-pull-secret
-    - name: s3-credentials
-      secret:
-        secretName: okd-s3-config
-    - name: shared-workspace
-      persistentVolumeClaim:
-        claimName: pipeline-scos-next-pvc
diff --git a/overlays/okd-images/kustomization.yaml b/overlays/okd-images/kustomization.yaml
index 72b90b8..f3d03f4 100644
--- a/overlays/okd-images/kustomization.yaml
+++ b/overlays/okd-images/kustomization.yaml
@@ -6,6 +6,7 @@ bases:
   - ../../base/build.openshift.io/buildconfigs/kvm-device-plugin
   - ../../base/build.openshift.io/buildconfigs/okd-builder
   - ../../base/image.openshift.io/imagestreams/centos
+  - ../../base/image.openshift.io/imagestreams/coreos-assembler
   - ../../base/image.openshift.io/imagestreams/kvm-device-plugin
   - ../../base/image.openshift.io/imagestreams/okd-artifacts
   - ../../base/rbac.authorization.k8s.io/rolebindings/kvm-device-plugin-image-puller