diff --git a/pkg/pipelines/tekton/tasks.go b/pkg/pipelines/tekton/tasks.go
index 42b222cb77..4d4ec76b92 100644
--- a/pkg/pipelines/tekton/tasks.go
+++ b/pkg/pipelines/tekton/tasks.go
@@ -406,6 +406,12 @@ spec:
   workspaces:
     - name: source
       description: The workspace containing the function project
+    - name: cache
+      optional: true
+    - name: sslcertdir
+      optional: true
+    - name: dockerconfig
+      optional: true
   steps:
     - name: func-deploy
       image: "%s"
@@ -431,6 +437,15 @@ spec:
     - name: path
       description: Path to the function project
       default: ""
+  workspaces:
+    - name: source
+      description: The workspace containing the function project
+    - name: cache
+      optional: true
+    - name: sslcertdir
+      optional: true
+    - name: dockerconfig
+      optional: true
   steps:
     - name: func-scaffold
       image: %s
diff --git a/pkg/pipelines/tekton/templates_pack.go b/pkg/pipelines/tekton/templates_pack.go
index 52f2612a63..f38c39d36f 100644
--- a/pkg/pipelines/tekton/templates_pack.go
+++ b/pkg/pipelines/tekton/templates_pack.go
@@ -49,6 +49,10 @@ spec:
       workspaces:
         - name: source
           workspace: source-workspace
+        - name: cache
+          workspace: cache-workspace
+        - name: dockerconfig
+          workspace: dockerconfig-workspace
       {{.RunAfterFetchSources}}
       {{.FuncScaffoldTaskRef}}
     - name: build
@@ -86,6 +90,10 @@ spec:
       workspaces:
         - name: source
           workspace: source-workspace
+        - name: cache
+          workspace: cache-workspace
+        - name: dockerconfig
+          workspace: dockerconfig-workspace
   workspaces:
     - description: Directory where function source is located.
       name: source-workspace
@@ -115,11 +123,11 @@ metadata:
 spec:
   params:
     - name: gitRepository
-      value: {{.RepoUrl}}
+      value: "{{.RepoUrl}}"
     - name: gitRevision
       value: {{.Revision}}
     - name: contextDir
-      value: {{.ContextDir}}
+      value: "{{.ContextDir}}"
     - name: imageName
       value: {{.FunctionImage}}
     - name: registry
@@ -182,7 +190,7 @@ spec:
     - name: gitRevision
       value: {{.Revision}}
     - name: contextDir
-      value: {{.ContextDir}}
+      value: "{{.ContextDir}}"
     - name: imageName
       value: {{.FunctionImage}}
     - name: registry
diff --git a/pkg/pipelines/tekton/templates_s2i.go b/pkg/pipelines/tekton/templates_s2i.go
index a0d1e9ce99..2c4c53a6f0 100644
--- a/pkg/pipelines/tekton/templates_s2i.go
+++ b/pkg/pipelines/tekton/templates_s2i.go
@@ -53,6 +53,10 @@ spec:
       workspaces:
         - name: source
           workspace: source-workspace
+        - name: cache
+          workspace: cache-workspace
+        - name: dockerconfig
+          workspace: dockerconfig-workspace
       {{.RunAfterFetchSources}}
       {{.FuncScaffoldTaskRef}}
     - name: build
@@ -92,6 +96,10 @@ spec:
       workspaces:
         - name: source
           workspace: source-workspace
+        - name: cache
+          workspace: cache-workspace
+        - name: dockerconfig
+          workspace: dockerconfig-workspace
   workspaces:
     - description: Directory where function source is located.
       name: source-workspace
@@ -120,11 +128,11 @@ metadata:
 spec:
   params:
     - name: gitRepository
-      value: {{.RepoUrl}}
+      value: "{{.RepoUrl}}"
     - name: gitRevision
       value: {{.Revision}}
     - name: contextDir
-      value: {{.ContextDir}}
+      value: "{{.ContextDir}}"
     - name: imageName
       value: {{.FunctionImage}}
     - name: registry
@@ -192,7 +200,7 @@ spec:
     - name: gitRevision
       value: {{.Revision}}
     - name: contextDir
-      value: {{.ContextDir}}
+      value: "{{.ContextDir}}"
     - name: imageName
       value: {{.FunctionImage}}
     - name: registry