diff --git a/riff-application-clusterbuilder.yaml b/riff-application-clusterbuilder.yaml
index 2ac3a50..0c1876a 100644
--- a/riff-application-clusterbuilder.yaml
+++ b/riff-application-clusterbuilder.yaml
@@ -1,6 +1,6 @@
-apiVersion: build.pivotal.io/v1alpha1
+apiVersion: kpack.io/v1alpha1
 kind: ClusterBuilder
 metadata:
   name: riff-application
 spec:
-  image: gcr.io/paketo-buildpacks/builder:base-platform-api-0.3
+  tag: gcr.io/paketo-buildpacks/builder:base-platform-api-0.3
diff --git a/riff-function-clusterbuilder.yaml b/riff-function-clusterbuilder.yaml
index f6d63bc..8456601 100644
--- a/riff-function-clusterbuilder.yaml
+++ b/riff-function-clusterbuilder.yaml
@@ -1,6 +1,6 @@
-apiVersion: build.pivotal.io/v1alpha1
+apiVersion: kpack.io/v1alpha1
 kind: ClusterBuilder
 metadata:
   name: riff-function
 spec:
-  image: gcr.io/projectriff/builder:latest
+  tag: gcr.io/projectriff/builder:latest