diff --git a/.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch b/.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch
deleted file mode 100644
index 20242852c6..0000000000
--- a/.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/dist/index.d.ts b/dist/index.d.ts
-index b88643b24b813cf5d9f1cfd17b182618c0937f8b..2407a197e182d7714607132ff2f306cb4a0ad16a 100644
---- a/dist/index.d.ts
-+++ b/dist/index.d.ts
-@@ -89,6 +89,7 @@ type TaskBrokerDispatchOptions = {
-  * @public
-  */
- interface TaskContext {
-+    taskId: string;
-     cancelSignal: AbortSignal;
-     spec: TaskSpec;
-     secrets?: TaskSecrets;
diff --git a/.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch b/.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch
new file mode 100644
index 0000000000..995f3e582c
--- /dev/null
+++ b/.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch
@@ -0,0 +1,21 @@
+diff --git a/dist/alpha.d.ts b/dist/alpha.d.ts
+index 7b6f3aa434c1cfcec9fc0b65cccace1f30b6542c..ee31d169c695a96328a6520417bbb135854c4e74 100644
+--- a/dist/alpha.d.ts
++++ b/dist/alpha.d.ts
+@@ -1,4 +1,3 @@
+-/// <reference types="node" />
+ import * as _backstage_backend_plugin_api from '@backstage/backend-plugin-api';
+ import { TemplateAction, TaskBroker, TemplateFilter, TemplateGlobal } from '@backstage/plugin-scaffolder-node';
+ 
+diff --git a/dist/index.d.ts b/dist/index.d.ts
+index 148a205bfe7747f916aebcb21c3c9cee45cdc07b..4a3126f375daa9e961743d210e3cecb390b2ec2b 100644
+--- a/dist/index.d.ts
++++ b/dist/index.d.ts
+@@ -89,6 +89,7 @@ type TaskBrokerDispatchOptions = {
+  * @public
+  */
+ interface TaskContext {
++    taskId: string;
+     cancelSignal: AbortSignal;
+     spec: TaskSpec;
+     secrets?: TaskSecrets;
diff --git a/package.json b/package.json
index 56cc8e1f28..2b8d812ce5 100644
--- a/package.json
+++ b/package.json
@@ -63,10 +63,12 @@
     "@backstage/plugin-scaffolder-backend@^1.24.0": "patch:@backstage/plugin-scaffolder-backend@npm%3A1.26.2#./.yarn/patches/@backstage-plugin-scaffolder-backend-npm-1.26.2.patch",
     "@backstage/plugin-scaffolder-backend@^1.22.6": "patch:@backstage/plugin-scaffolder-backend@npm%3A1.26.2#./.yarn/patches/@backstage-plugin-scaffolder-backend-npm-1.26.2.patch",
     "@backstage/plugin-scaffolder-backend@1.26.2": "patch:@backstage/plugin-scaffolder-backend@npm%3A1.26.2#./.yarn/patches/@backstage-plugin-scaffolder-backend-npm-1.26.2.patch",
-    "@backstage/plugin-scaffolder-node@^0.5.0": "patch:@backstage/plugin-scaffolder-node@npm%3A0.5.0#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch",
-    "@backstage/plugin-scaffolder-node@^0.4.9": "patch:@backstage/plugin-scaffolder-node@npm%3A0.5.0#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch",
-    "@backstage/plugin-scaffolder-node@^0.2.9": "patch:@backstage/plugin-scaffolder-node@npm%3A0.5.0#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch",
-    "@backstage/plugin-scaffolder-node@^0.4.8": "patch:@backstage/plugin-scaffolder-node@npm%3A0.5.0#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch"
+    "@backstage/plugin-scaffolder-node@^0.5.0": "patch:@backstage/plugin-scaffolder-node@npm%3A0.6.1#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch",
+    "@backstage/plugin-scaffolder-node@^0.4.9": "patch:@backstage/plugin-scaffolder-node@npm%3A0.6.1#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch",
+    "@backstage/plugin-scaffolder-node@^0.2.9": "patch:@backstage/plugin-scaffolder-node@npm%3A0.6.1#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch",
+    "@backstage/plugin-scaffolder-node@^0.4.8": "patch:@backstage/plugin-scaffolder-node@npm%3A0.6.1#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch",
+    "@backstage/plugin-scaffolder-node@^0.6.0": "patch:@backstage/plugin-scaffolder-node@npm%3A0.6.1#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch",
+    "@backstage/plugin-scaffolder-node@^0.5.1": "patch:@backstage/plugin-scaffolder-node@npm%3A0.6.1#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch"
   },
   "jest": {
     "testTimeout": 20000
diff --git a/yarn.lock b/yarn.lock
index a4e5aa852f..1b674ec347 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8003,59 +8003,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@backstage/plugin-scaffolder-node@npm:0.5.0":
-  version: 0.5.0
-  resolution: "@backstage/plugin-scaffolder-node@npm:0.5.0"
-  dependencies:
-    "@backstage/backend-common": ^0.25.0
-    "@backstage/backend-plugin-api": ^1.0.1
-    "@backstage/catalog-model": ^1.7.0
-    "@backstage/errors": ^1.2.4
-    "@backstage/integration": ^1.15.1
-    "@backstage/plugin-scaffolder-common": ^1.5.6
-    "@backstage/types": ^1.1.1
-    concat-stream: ^2.0.0
-    fs-extra: ^11.2.0
-    globby: ^11.0.0
-    isomorphic-git: ^1.23.0
-    jsonschema: ^1.2.6
-    p-limit: ^3.1.0
-    tar: ^6.1.12
-    winston: ^3.2.1
-    zod: ^3.22.4
-    zod-to-json-schema: ^3.20.4
-  checksum: ebb1fdcbc31140c98dc92bbd1a585aa3b4840ac9b9f4b59dad01ce86014494554cced8fb81bb6605abe5a6099a41feb7cbebbca1c8bf7d38c48f9ee346a3eb15
-  languageName: node
-  linkType: hard
-
-"@backstage/plugin-scaffolder-node@npm:^0.5.1":
-  version: 0.5.1
-  resolution: "@backstage/plugin-scaffolder-node@npm:0.5.1"
-  dependencies:
-    "@backstage/backend-common": ^0.25.0
-    "@backstage/backend-plugin-api": ^1.0.1
-    "@backstage/catalog-model": ^1.7.0
-    "@backstage/errors": ^1.2.4
-    "@backstage/integration": ^1.15.1
-    "@backstage/plugin-scaffolder-common": ^1.5.6
-    "@backstage/types": ^1.1.1
-    concat-stream: ^2.0.0
-    fs-extra: ^11.2.0
-    globby: ^11.0.0
-    isomorphic-git: ^1.23.0
-    jsonschema: ^1.2.6
-    p-limit: ^3.1.0
-    tar: ^6.1.12
-    winston: ^3.2.1
-    zod: ^3.22.4
-    zod-to-json-schema: ^3.20.4
-  checksum: 8cbbdbee87a537f3aade9cbf4aaea0db4f4c8272fc4c05557acb8fa1b8abad21a581949c7d1fd9d9aca736c0de405086ffa28fda31ad2752fdad2ace6c756917
-  languageName: node
-  linkType: hard
-
-"@backstage/plugin-scaffolder-node@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "@backstage/plugin-scaffolder-node@npm:0.6.0"
+"@backstage/plugin-scaffolder-node@npm:0.6.1":
+  version: 0.6.1
+  resolution: "@backstage/plugin-scaffolder-node@npm:0.6.1"
   dependencies:
     "@backstage/backend-common": ^0.25.0
     "@backstage/backend-plugin-api": ^1.0.2
@@ -8074,21 +8024,21 @@ __metadata:
     winston: ^3.2.1
     zod: ^3.22.4
     zod-to-json-schema: ^3.20.4
-  checksum: 16a8b05b858e3b284d606ed1144077fe50fb5e434591327476c98d3d6b3c8b6f73a5aaf28957c7e41f49f873dca0543c1d2816a4e56b2fdd62ae0490b918048c
+  checksum: 6a664bd87cdfc93b34bdf54bbdfc4506660d6f7ce38564818188d05c0b710143206b350cc4fc8aa2ab548a62d7bf7434a27731695450d590d52595f3f3e6bb6f
   languageName: node
   linkType: hard
 
-"@backstage/plugin-scaffolder-node@patch:@backstage/plugin-scaffolder-node@npm%3A0.5.0#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch::locator=root%40workspace%3A.":
-  version: 0.5.0
-  resolution: "@backstage/plugin-scaffolder-node@patch:@backstage/plugin-scaffolder-node@npm%3A0.5.0#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.5.0.patch::version=0.5.0&hash=ed21c3&locator=root%40workspace%3A."
+"@backstage/plugin-scaffolder-node@patch:@backstage/plugin-scaffolder-node@npm%3A0.6.1#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch::locator=root%40workspace%3A.":
+  version: 0.6.1
+  resolution: "@backstage/plugin-scaffolder-node@patch:@backstage/plugin-scaffolder-node@npm%3A0.6.1#./.yarn/patches/@backstage-plugin-scaffolder-node-npm-0.6.1-a2cc13065e.patch::version=0.6.1&hash=bebc95&locator=root%40workspace%3A."
   dependencies:
     "@backstage/backend-common": ^0.25.0
-    "@backstage/backend-plugin-api": ^1.0.1
-    "@backstage/catalog-model": ^1.7.0
-    "@backstage/errors": ^1.2.4
-    "@backstage/integration": ^1.15.1
-    "@backstage/plugin-scaffolder-common": ^1.5.6
-    "@backstage/types": ^1.1.1
+    "@backstage/backend-plugin-api": ^1.0.2
+    "@backstage/catalog-model": ^1.7.1
+    "@backstage/errors": ^1.2.5
+    "@backstage/integration": ^1.15.2
+    "@backstage/plugin-scaffolder-common": ^1.5.7
+    "@backstage/types": ^1.2.0
     concat-stream: ^2.0.0
     fs-extra: ^11.2.0
     globby: ^11.0.0
@@ -8099,7 +8049,7 @@ __metadata:
     winston: ^3.2.1
     zod: ^3.22.4
     zod-to-json-schema: ^3.20.4
-  checksum: 3be41d3f208d09805fdbc2c7de6b1ec72014b027c3ac4e51c4f532d12fd5fed81ad342ea4a82fab618d3587e3aacf7e83cc14ff2eca6c5ca11a19f692ffe887f
+  checksum: c89f6bc58a4ce97ec632be2d533cdfc49df0f67fb04511c2541ad8a2cd187223f800b842b90d63dddfebc367e443e23621a18209dbfbd7a82d548e9c60058ace
   languageName: node
   linkType: hard