diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/store/github.ts b/plugins/scaffolder-backend/src/scaffolder/stages/store/github.ts
index 046a6599fb..8f5cc40ff9 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/store/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/store/github.ts
@@ -20,7 +20,6 @@ import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
 import { JsonValue } from '@backstage/config';
 import { RequiredTemplateValues } from '../templater';
 import { Repository, Remote, Signature, Cred } from 'nodegit';
-import gitParse from 'git-url-parse';
 
 export class GithubStorer implements Storer {
   private client: Octokit;
@@ -34,7 +33,7 @@ export class GithubStorer implements Storer {
     entity: TemplateEntityV1alpha1;
     values: RequiredTemplateValues & Record<string, JsonValue>;
   }) {
-    const [owner, name] = values.owner.split('/');
+    const [owner, name] = values.storePath.split('/');
 
     const {
       data: { clone_url: cloneUrl },
diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts
index 5e875b6838..3e94d67c6e 100644
--- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.ts
@@ -65,6 +65,6 @@ export class CookieCutter implements TemplaterBase {
       dockerClient: options.dockerClient,
     });
 
-    return path.resolve(resultDir, options.values.component_id);
+    return path.resolve(resultDir, options.values.component_id as string);
   }
 }