diff --git a/.tekton/pipeline-build.yaml b/.tekton/pipeline-build.yaml
index 7b821bdcd..4d34de79c 100644
--- a/.tekton/pipeline-build.yaml
+++ b/.tekton/pipeline-build.yaml
@@ -89,6 +89,10 @@ spec:
       description: ""
       value: $(tasks.clone-repository.results.commit)
 
+  volumes:
+    - name: workdir
+      emptyDir: {}
+
   tasks:
     - name: init
       params:
@@ -147,9 +151,6 @@ spec:
         - name: basic-auth
           workspace: git-auth
 
-        - name: output
-          workspace: workspace
-
     - name: prefetch-dependencies
       params:
         - name: input
@@ -187,6 +188,9 @@ spec:
       params:
         - name: path-context
           value: $(params.path-context)
+
+        - name: source_artifact
+          value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
       taskRef:
         resolver: git
         params:
@@ -198,9 +202,9 @@ spec:
 
           - name: pathInRepo
             value: tasks/parse-build-deploy-script/parse-build-deploy-script.yaml
-      workspaces:
-        - name: source
-          workspace: workspace
+      volumeMounts:
+        - name: workdir
+          mountPath: /var/workdir
       runAfter:
         - clone-repository
 
@@ -244,6 +248,9 @@ spec:
 
         - name: dist-folder
           value: $(tasks.parse-build-deploy-script.results.dist-folder)
+
+        - name: source_artifact
+          value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
       taskRef:
         resolver: git
         params:
@@ -255,11 +262,11 @@ spec:
 
           - name: pathInRepo
             value: tasks/create-frontend-dockerfile/create-frontend-dockerfile.yaml
-      workspaces:
-        - name: source
-          workspace: workspace
       runAfter:
         - parse-build-deploy-script
+      volumeMounts:
+        - name: workdir
+          mountPath: /var/workdir
 
     - name: build-container
       params:
diff --git a/.tekton/pull_request.yaml b/.tekton/pull_request.yaml
index 367f87556..ad1ba0ace 100644
--- a/.tekton/pull_request.yaml
+++ b/.tekton/pull_request.yaml
@@ -48,15 +48,3 @@ spec:
     - name: git-auth
       secret:
         secretName: '{{ git_auth_secret }}'
-
-    - name: workspace
-      volumeClaimTemplate:
-        metadata:
-          creationTimestamp: null
-        spec:
-          accessModes:
-            - ReadWriteOnce
-          resources:
-            requests:
-              storage: 1Gi
-        status: {}
diff --git a/.tekton/push.yaml b/.tekton/push.yaml
index 965512173..1487a7ac6 100644
--- a/.tekton/push.yaml
+++ b/.tekton/push.yaml
@@ -44,15 +44,3 @@ spec:
     - name: git-auth
       secret:
         secretName: '{{ git_auth_secret }}'
-
-    - name: workspace
-      volumeClaimTemplate:
-        metadata:
-          creationTimestamp: null
-        spec:
-          accessModes:
-            - ReadWriteOnce
-          resources:
-            requests:
-              storage: 1Gi
-        status: {}