diff --git a/client/src/cordova/build.action.mjs b/client/src/cordova/build.action.mjs
index 5ffa105820..ebdd58e820 100644
--- a/client/src/cordova/build.action.mjs
+++ b/client/src/cordova/build.action.mjs
@@ -43,7 +43,7 @@ export async function main(...parameters) {
   }
 
   // this is so cordova doesn't complain about not being in a cordova project
-  process.env.PWD = getRootDir();
+  process.env.PWD = path.resolve(getRootDir(), 'client');
 
   switch (platform + buildMode) {
     case 'android' + 'debug':
diff --git a/client/src/cordova/setup.action.mjs b/client/src/cordova/setup.action.mjs
index 74022383e8..2bf5af0278 100644
--- a/client/src/cordova/setup.action.mjs
+++ b/client/src/cordova/setup.action.mjs
@@ -50,7 +50,7 @@ export async function main(...parameters) {
   }
 
   // this is so cordova doesn't complain about not being in a cordova project
-  process.env.PWD = getRootDir();
+  process.env.PWD = path.resolve(getRootDir(), 'client');
 
   switch (platform + buildMode) {
     case 'android' + 'debug':
diff --git a/src/electron/build.action.mjs b/src/electron/build.action.mjs
index 08cdecb5e4..88502d1dad 100644
--- a/src/electron/build.action.mjs
+++ b/src/electron/build.action.mjs
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 import minimist from 'minimist';
-import {getBuildParameters} from '../../client/src/build/get_build_parameters.mjs';
 import {runAction} from '../build/run_action.mjs';
+import {getBuildParameters} from '../../client/src/build/get_build_parameters.mjs';
 import electron, {Platform} from 'electron-builder';
 import copydir from 'copy-dir';
 import fs from 'fs/promises';
diff --git a/src/electron/build_main.action.mjs b/src/electron/build_main.action.mjs
index 35565e43e2..2506acdf39 100644
--- a/src/electron/build_main.action.mjs
+++ b/src/electron/build_main.action.mjs
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {getBuildParameters} from '../build/get_build_parameters.mjs';
-import {getWebpackBuildMode} from '../build/get_webpack_build_mode.mjs';
 import {runAction} from '../build/run_action.mjs';
+import {getBuildParameters} from '../../client/src/build/get_build_parameters.mjs';
+import {getWebpackBuildMode} from '../../client/src/build/get_webpack_build_mode.mjs';
 import {runWebpack} from '../../client/src/build/run_webpack.mjs';
 import electronMainWebpackConfigs from './webpack_electron_main.mjs';
 import fs from 'fs/promises';