diff --git a/dist/index.js b/dist/index.js
index 2fce88a..ede61a0 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -36008,14 +36008,14 @@ function getFetchUrl(settings) {
         return `git@${serviceUrl.hostname}:${encodedOwner}/${encodedName}.git`;
     }
     // "origin" is SCHEME://HOSTNAME[:PORT]
-    return `${serviceUrl.origin}/gitea/${encodedOwner}/${encodedName}`;
+    return `${serviceUrl.origin}/${encodedOwner}/${encodedName}`;
 }
 exports.getFetchUrl = getFetchUrl;
 function getServerUrl() {
     // todo: remove GITHUB_URL after support for GHES Alpha is no longer needed
-    return new url_1.URL(process.env['GITHUB_SERVER_URL'] ||
-        process.env['GITHUB_URL'] ||
-        'https://github.com');
+    return new url_1.URL(process.env['GITHUB_SERVER_URL'] + '/gitea' ||
+        0 ||
+        0);
 }
 exports.getServerUrl = getServerUrl;
 
diff --git a/src/url-helper.ts b/src/url-helper.ts
index 9e74c7b..02dd8f7 100644
--- a/src/url-helper.ts
+++ b/src/url-helper.ts
@@ -16,14 +16,14 @@ export function getFetchUrl(settings: IGitSourceSettings): string {
   }
 
   // "origin" is SCHEME://HOSTNAME[:PORT]
-  return `${serviceUrl.origin}/gitea/${encodedOwner}/${encodedName}`
+  return `${serviceUrl.origin}/${encodedOwner}/${encodedName}`
 }
 
 export function getServerUrl(): URL {
   // todo: remove GITHUB_URL after support for GHES Alpha is no longer needed
   return new URL(
-    process.env['GITHUB_SERVER_URL'] ||
-      process.env['GITHUB_URL'] ||
+    process.env['GITHUB_SERVER_URL'] + '/gitea' ||
+      process.env['GITHUB_URL'] + '/gitea' ||
       'https://github.com'
   )
 }