diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e788a6fe95..25073c9556 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -70,6 +70,8 @@ yarn.lock                                         @backstage/maintainers @backst
 /plugins/playlist-*                               @backstage/maintainers @backstage/reviewers @kuangp
 /plugins/rollbar                                  @backstage/maintainers @backstage/reviewers @andrewthauer
 /plugins/rollbar-backend                          @backstage/maintainers @backstage/reviewers @andrewthauer
+/plugins/scaffolder                               @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers
+/plugins/scaffolder-*                             @backstage/maintainers @backstage/reviewers @backstage/scaffolder-maintainers
 /plugins/search                                   @backstage/discoverability-maintainers
 /plugins/search-*                                 @backstage/discoverability-maintainers
 /plugins/sonarqube                                @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
diff --git a/packages/create-app/src/lib/tasks.test.ts b/packages/create-app/src/lib/tasks.test.ts
index e122374004..c436bf5ad2 100644
--- a/packages/create-app/src/lib/tasks.test.ts
+++ b/packages/create-app/src/lib/tasks.test.ts
@@ -103,6 +103,7 @@ describe('tasks', () => {
 
   const mockDir = createMockDirectory();
 
+  const origCwd = process.cwd();
   const realChdir = process.chdir;
   // If anyone calls chdir then make it resolve within the tmpdir
   const mockChdir = jest.spyOn(process, 'chdir');
@@ -130,6 +131,10 @@ describe('tasks', () => {
     mockChdir.mockReset();
   });
 
+  afterAll(() => {
+    realChdir(origCwd);
+  });
+
   describe('checkAppExistsTask', () => {
     it('should do nothing if the directory does not exist', async () => {
       const dir = 'projects/';