diff --git a/dist/restore-only/index.js b/dist/restore-only/index.js
index 3e4df88db..ab3fcd172 100644
--- a/dist/restore-only/index.js
+++ b/dist/restore-only/index.js
@@ -146664,7 +146664,10 @@ function restoreImpl(stateProvider) {
             const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
                 required: true
             });
-            const s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            let s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            if (s3BucketName.endsWith(".amazonaws.com")) {
+                s3BucketName = s3BucketName.split(".")[0];
+            }
             const s3config = utils.getInputS3ClientConfig();
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
             const failOnCacheMiss = utils.getInputAsBool(constants_1.Inputs.FailOnCacheMiss);
diff --git a/dist/restore/index.js b/dist/restore/index.js
index 23aa3f953..93b3f6190 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -146664,7 +146664,10 @@ function restoreImpl(stateProvider) {
             const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
                 required: true
             });
-            const s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            let s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            if (s3BucketName.endsWith(".amazonaws.com")) {
+                s3BucketName = s3BucketName.split(".")[0];
+            }
             const s3config = utils.getInputS3ClientConfig();
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
             const failOnCacheMiss = utils.getInputAsBool(constants_1.Inputs.FailOnCacheMiss);
diff --git a/dist/save-only/index.js b/dist/save-only/index.js
index 168203055..2c006f381 100644
--- a/dist/save-only/index.js
+++ b/dist/save-only/index.js
@@ -146677,7 +146677,10 @@ function saveImpl(stateProvider) {
             const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
                 required: true
             });
-            const s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            let s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            if (s3BucketName.endsWith(".amazonaws.com")) {
+                s3BucketName = s3BucketName.split(".")[0];
+            }
             const s3config = utils.getInputS3ClientConfig();
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
             cacheId = yield cache.saveCache(cachePaths.slice(), primaryKey, { uploadChunkSize: utils.getInputAsInt(constants_1.Inputs.UploadChunkSize) }, enableCrossOsArchive, s3config, s3BucketName);
diff --git a/dist/save/index.js b/dist/save/index.js
index d5474b628..cc2f7f213 100644
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -146708,7 +146708,10 @@ function saveImpl(stateProvider) {
             const cachePaths = utils.getInputAsArray(constants_1.Inputs.Path, {
                 required: true
             });
-            const s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            let s3BucketName = core.getInput(constants_1.Inputs.AWSS3Bucket);
+            if (s3BucketName.endsWith(".amazonaws.com")) {
+                s3BucketName = s3BucketName.split(".")[0];
+            }
             const s3config = utils.getInputS3ClientConfig();
             const enableCrossOsArchive = utils.getInputAsBool(constants_1.Inputs.EnableCrossOsArchive);
             cacheId = yield cache.saveCache(cachePaths.slice(), primaryKey, { uploadChunkSize: utils.getInputAsInt(constants_1.Inputs.UploadChunkSize) }, enableCrossOsArchive, s3config, s3BucketName);
diff --git a/src/restoreImpl.ts b/src/restoreImpl.ts
index ef75f4040..7a4b5b63a 100644
--- a/src/restoreImpl.ts
+++ b/src/restoreImpl.ts
@@ -35,7 +35,10 @@ export async function restoreImpl(
         const cachePaths = utils.getInputAsArray(Inputs.Path, {
             required: true
         });
-        const s3BucketName = core.getInput(Inputs.AWSS3Bucket);
+        let s3BucketName = core.getInput(Inputs.AWSS3Bucket);
+        if (s3BucketName.endsWith(".amazonaws.com")) {
+            s3BucketName = s3BucketName.split(".")[0];
+        }
         const s3config = utils.getInputS3ClientConfig();
 
         const enableCrossOsArchive = utils.getInputAsBool(
diff --git a/src/saveImpl.ts b/src/saveImpl.ts
index ff9710679..affd7ae2d 100644
--- a/src/saveImpl.ts
+++ b/src/saveImpl.ts
@@ -51,7 +51,11 @@ async function saveImpl(stateProvider: IStateProvider): Promise<number | void> {
         const cachePaths = utils.getInputAsArray(Inputs.Path, {
             required: true
         });
-        const s3BucketName = core.getInput(Inputs.AWSS3Bucket);
+        let s3BucketName = core.getInput(Inputs.AWSS3Bucket);
+        if (s3BucketName.endsWith(".amazonaws.com")) {
+            s3BucketName = s3BucketName.split(".")[0];
+        }
+
         const s3config = utils.getInputS3ClientConfig();
 
         const enableCrossOsArchive = utils.getInputAsBool(