diff --git a/tekton/release-pipeline-run.yml b/tekton/release-pipeline-run.yml
index 8834fd6b4..547be2405 100644
--- a/tekton/release-pipeline-run.yml
+++ b/tekton/release-pipeline-run.yml
@@ -1,15 +1,4 @@
 ---
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: tektoncd-cli-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 500Mi
----
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
@@ -19,8 +8,13 @@ spec:
     name: cli-release-pipeline
   workspaces:
     - name: shared-workspace
-      persistentvolumeclaim:
-        claimName: tektoncd-cli-pvc
+      volumeClaimTemplate:
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 500Mi
   params:
     - name: revision
       value: v0.2.2
diff --git a/tekton/release.sh b/tekton/release.sh
index 3970d2809..6540ca338 100755
--- a/tekton/release.sh
+++ b/tekton/release.sh
@@ -137,20 +137,6 @@ kubectl -n ${TARGET_NAMESPACE} apply -f ./tekton/release-pipeline.yml
 
 sleep 2
 
-# Until tkn supports tkn create with parameters we do like this,
-cat <<EOF | kubectl -n ${TARGET_NAMESPACE} apply -f-
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: tektoncd-cli-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 500Mi
-EOF
-
 # Start the pipeline, We can't use tkn start because until #272 and #262 are imp/fixed
 cat <<EOF | kubectl -n ${TARGET_NAMESPACE} create -f-
 apiVersion: tekton.dev/v1beta1
@@ -162,8 +148,13 @@ spec:
     name: cli-release-pipeline
   workspaces:
     - name: shared-workspace
-      persistentvolumeclaim:
-        claimName: tektoncd-cli-pvc
+      volumeClaimTemplate:
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 500Mi
   params:
     - name: revision
       value: ${RELEASE_VERSION}