diff --git a/dist/setup/index.js b/dist/setup/index.js
index 0dcd2342d..8f52dfd65 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -61155,7 +61155,8 @@ const restoreCache = (versionSpec, packageManager, cacheDependencyPath) => __awa
     if (!fileHash) {
         throw new Error('Some specified paths were not resolved, unable to cache dependencies.');
     }
-    const primaryKey = `setup-go-${platform}-go-${versionSpec}-${fileHash}`;
+    const imageOS = process.env.ImageOS || 'self-hosted';
+    const primaryKey = `setup-go-${platform}-${imageOS}-go-${versionSpec}-${fileHash}`;
     core.debug(`primary key is ${primaryKey}`);
     core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
     const cacheKey = yield cache.restoreCache(cachePaths, primaryKey);
diff --git a/src/cache-restore.ts b/src/cache-restore.ts
index 14f84c448..b3998eaa8 100644
--- a/src/cache-restore.ts
+++ b/src/cache-restore.ts
@@ -29,7 +29,8 @@ export const restoreCache = async (
     );
   }
 
-  const primaryKey = `setup-go-${platform}-go-${versionSpec}-${fileHash}`;
+  const imageOS = process.env.ImageOS || 'self-hosted';
+  const primaryKey = `setup-go-${platform}-${imageOS}-go-${versionSpec}-${fileHash}`;
   core.debug(`primary key is ${primaryKey}`);
 
   core.saveState(State.CachePrimaryKey, primaryKey);