diff --git a/dist/index.js b/dist/index.js
index c9dd24c..00ac18f 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -35500,7 +35500,7 @@ async function main() {
     const debug = core.getBooleanInput('debug');
     const userAgent = core.getInput('user-agent');
     const previews = core.getInput('previews');
-    // const baseUrl = core.getInput('base-url')
+    const baseUrl = core.getInput('base-url');
     const retries = parseInt(core.getInput('retries'));
     const exemptStatusCodes = parseNumberArray(core.getInput('retry-exempt-status-codes'));
     const [retryOpts, requestOpts] = getRetryOptions(retries, exemptStatusCodes, utils.defaults);
@@ -35509,15 +35509,9 @@ async function main() {
         userAgent: userAgent || undefined,
         previews: previews ? previews.split(',') : undefined,
         retry: retryOpts,
-        request: requestOpts
+        request: requestOpts,
+        baseUrl: baseUrl || lib_github.context.serverUrl
     };
-    // Testing without base URL entirely.
-    // if (baseUrl) {
-    //   debug && console.log(`Using custom base URL: ${baseUrl}`)
-    //   opts.baseUrl = baseUrl
-    // } else {
-    //   debug && console.log('Using default base URL')
-    // }
     const github = (0,lib_github.getOctokit)(token, opts, plugin_retry_dist_node.retry, dist_node.requestLog);
     const script = core.getInput('script', { required: true });
     // Using property/value shorthand on `require` (e.g. `{require}`) causes compilation errors.
diff --git a/src/main.ts b/src/main.ts
index fb69969..56c8f51 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -28,7 +28,7 @@ async function main(): Promise<void> {
   const debug = core.getBooleanInput('debug')
   const userAgent = core.getInput('user-agent')
   const previews = core.getInput('previews')
-  // const baseUrl = core.getInput('base-url')
+  const baseUrl = core.getInput('base-url')
   const retries = parseInt(core.getInput('retries'))
   const exemptStatusCodes = parseNumberArray(
     core.getInput('retry-exempt-status-codes')
@@ -44,17 +44,10 @@ async function main(): Promise<void> {
     userAgent: userAgent || undefined,
     previews: previews ? previews.split(',') : undefined,
     retry: retryOpts,
-    request: requestOpts
+    request: requestOpts,
+    baseUrl: baseUrl || context.serverUrl
   }
 
-  // Testing without base URL entirely.
-  // if (baseUrl) {
-  //   debug && console.log(`Using custom base URL: ${baseUrl}`)
-  //   opts.baseUrl = baseUrl
-  // } else {
-  //   debug && console.log('Using default base URL')
-  // }
-
   const github = getOctokit(token, opts, retry, requestLog)
   const script = core.getInput('script', {required: true})