diff --git a/src/commands/submit.ts b/src/commands/submit.ts
index 69651ce..064e1b4 100644
--- a/src/commands/submit.ts
+++ b/src/commands/submit.ts
@@ -76,7 +76,10 @@ async function tryMultiStepUploadOrFallbackToSingle(
     if (axios.isAxiosError(err)) {
       // CI doesn't like safe-access here.
       if (err.response && err.response.status === 404) {
-        context.logger.info('Falling back to single step upload');
+        context.logger.info(
+          'Received 404 trying to get signed URLs. Assuming feature is notn released yet and falling back to single step upload',
+          {err}
+        );
         // eslint-disable-next-line import/no-deprecated
         return await singleStepUpload(input, context);
       }
diff --git a/src/lib/upload.ts b/src/lib/upload.ts
index fceb764..98cf27c 100644
--- a/src/lib/upload.ts
+++ b/src/lib/upload.ts
@@ -104,8 +104,8 @@ export async function getSignedUploadUrls(
     {filenames, label, root, sha},
     {
       auth: {password: token, username: 'token'},
-
       maxContentLength: Infinity,
+      timeout: 30000,
     }
   );