diff --git a/app-config.yaml b/app-config.yaml
index b527069c15..768e60a346 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -147,7 +147,7 @@ catalog:
 
 scaffolder:
   github:
-    baseUrl: https://github.com
+    host: https://github.com
     token:
       $env: GITHUB_TOKEN
     visibility: public # or 'internal' or 'private'
diff --git a/packages/backend/src/plugins/scaffolder.ts b/packages/backend/src/plugins/scaffolder.ts
index 7ba90ed8b5..24bd4e942f 100644
--- a/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/backend/src/plugins/scaffolder.ts
@@ -68,10 +68,11 @@ export default async function createPlugin({
       ) as RepoVisibilityOptions;
 
       const githubToken = githubConfig.getString('token');
-      const githubBaseUrl = githubConfig.getString('baseUrl');
+      const githubHost =
+        githubConfig.getOptionalString('host') ?? 'https://github.com';
       const githubClient = new Octokit({
         auth: githubToken,
-        baseUrl: githubBaseUrl,
+        baseUrl: githubHost,
       });
       const githubPublisher = new GithubPublisher({
         client: githubClient,
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
index 9f59412036..240309fbd1 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
@@ -48,8 +48,8 @@ export default async function createPlugin({
       ) as RepoVisibilityOptions;
 
       const githubToken = githubConfig.getString('token');
-      const githubBaseUrl = githubConfig.getString('baseUrl');
-      const githubClient = new Octokit({ auth: githubToken, baseUrl: githubBaseUrl });
+      const githubHost = githubConfig.getOptionalString('host');
+      const githubClient = new Octokit({ auth: githubToken, baseUrl: githubHost });
       const githubPublisher = new GithubPublisher({
         client: githubClient,
         token: githubToken,