diff --git a/riff-application-clusterbuildtemplate.yaml b/riff-application-clusterbuildtemplate.yaml
index f49974d..cd08943 100644
--- a/riff-application-clusterbuildtemplate.yaml
+++ b/riff-application-clusterbuildtemplate.yaml
@@ -8,7 +8,7 @@ spec:
     description: The image you wish to create. For example, "repo/example", or "example.com/repo/image".
   - name: BUILDER_IMAGE
     description: The builder image (must include v3 lifecycle and compatible buildpacks).
-    default: cloudfoundry/cnb:bionic
+    default: cloudfoundry/cnb:0.0.5-bionic
   - name: USE_CRED_HELPERS
     description: Use Docker credential helpers for Google's GCR, Amazon's ECR, or Microsoft's ACR.
     default: 'false'
@@ -71,6 +71,7 @@ spec:
     command: ["/lifecycle/analyzer"]
     args:
     - "-layers=/layers"
+    - "-analyzed=/layers/analyzed.toml"
     - "-helpers=${USE_CRED_HELPERS}"
     - "-group=/layers/group.toml"
     - "${IMAGE}"
@@ -97,6 +98,7 @@ spec:
     command: ["/lifecycle/exporter"]
     args:
     - "-layers=/layers"
+    - "-analyzed=/layers/analyzed.toml"
     - "-helpers=${USE_CRED_HELPERS}"
     - "-app=/workspace"
     - "-group=/layers/group.toml"