diff --git a/tools/cli/src/webpack/config.ts b/tools/cli/src/webpack/config.ts
index b6abab4958..e1bd39b768 100644
--- a/tools/cli/src/webpack/config.ts
+++ b/tools/cli/src/webpack/config.ts
@@ -334,7 +334,9 @@ export const createConfiguration: (
               },
             ],
           }),
-      buildFlags.mode === 'production' && process.env.R2_SECRET_ACCESS_KEY
+      buildFlags.mode === 'production' &&
+      (buildConfig.isWeb || buildConfig.isMobileWeb) &&
+      process.env.R2_SECRET_ACCESS_KEY
         ? new WebpackS3Plugin()
         : null,
     ]),
diff --git a/tools/cli/src/webpack/runtime-config.ts b/tools/cli/src/webpack/runtime-config.ts
index 88ee8399a4..b9d8f12420 100644
--- a/tools/cli/src/webpack/runtime-config.ts
+++ b/tools/cli/src/webpack/runtime-config.ts
@@ -12,9 +12,9 @@ export function getBuildConfig(buildFlags: BuildFlags): BUILD_CONFIG_TYPE {
         isDesktopEdition: (
           ['web', 'desktop', 'admin'] as BuildFlags['distribution'][]
         ).includes(buildFlags.distribution),
-        isMobileEdition: (['mobile'] as BuildFlags['distribution'][]).includes(
-          buildFlags.distribution
-        ),
+        isMobileEdition: (
+          ['mobile', 'ios', 'android'] as BuildFlags['distribution'][]
+        ).includes(buildFlags.distribution),
         isElectron: buildFlags.distribution === 'desktop',
         isWeb: buildFlags.distribution === 'web',
         isMobileWeb: buildFlags.distribution === 'mobile',