diff --git a/.github/workflows/frontend-admin-build-local.yml b/.github/workflows/frontend-admin-build-local.yml
index e7cc76a0..9580578a 100644
--- a/.github/workflows/frontend-admin-build-local.yml
+++ b/.github/workflows/frontend-admin-build-local.yml
@@ -35,7 +35,7 @@ jobs:
             - name: Install EAS CLI & tooling
               run: |
                   npm install -g eas-cli
-                  pip install -r scripts/requirements.txt --quiet
+                  pip install -r scripts/requirements.txt awscli --quiet
 
             - name: Install dependencies
               working-directory: frontend-admin
@@ -86,14 +86,7 @@ jobs:
                   EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}
                   EAS_BUILD_NO_EXPO_GO_WARNING: true
                   NODE_OPTIONS: "--max-old-space-size=2048"
-                  GRADLE_OPTS: >-
-                      -Dorg.gradle.jvmargs=-Xmx3g
-                      -XX:MaxMetaspaceSize=512m
-                      -XX:+UseG1GC
-                      -XX:+HeapDumpOnOutOfMemoryError
-                      -Dorg.gradle.daemon=false
-                      -Dorg.gradle.parallel=true
-                      -Dorg.gradle.workers.max=3
+                  GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2"
                   JAVA_TOOL_OPTIONS: "-Xmx3g"
               run: eas build --platform android --profile ${{ steps.config.outputs.profile }} --local --non-interactive
 
diff --git a/.github/workflows/frontend-client-build-local.yml b/.github/workflows/frontend-client-build-local.yml
index 9a4837c0..dca47004 100644
--- a/.github/workflows/frontend-client-build-local.yml
+++ b/.github/workflows/frontend-client-build-local.yml
@@ -35,7 +35,7 @@ jobs:
             - name: Install EAS CLI & tooling
               run: |
                   npm install -g eas-cli
-                  pip install -r scripts/requirements.txt --quiet
+                  pip install -r scripts/requirements.txt awscli --quiet
 
             - name: Install dependencies
               working-directory: mobile
@@ -86,14 +86,7 @@ jobs:
                   EXPO_PUBLIC_UPDATE_URL: ${{ secrets.XAVIA_API_URL }}
                   EAS_BUILD_NO_EXPO_GO_WARNING: true
                   NODE_OPTIONS: "--max-old-space-size=2048"
-                  GRADLE_OPTS: >-
-                      -Dorg.gradle.jvmargs=-Xmx3g
-                      -XX:MaxMetaspaceSize=512m
-                      -XX:+UseG1GC
-                      -XX:+HeapDumpOnOutOfMemoryError
-                      -Dorg.gradle.daemon=false
-                      -Dorg.gradle.parallel=true
-                      -Dorg.gradle.workers.max=3
+                  GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2"
                   JAVA_TOOL_OPTIONS: "-Xmx3g"
               run: eas build --platform android --profile ${{ steps.config.outputs.profile }} --local --non-interactive
 
diff --git a/.github/workflows/frontend-web-build.yml b/.github/workflows/frontend-web-build.yml
index dd3d96d3..a1b88599 100644
--- a/.github/workflows/frontend-web-build.yml
+++ b/.github/workflows/frontend-web-build.yml
@@ -5,12 +5,11 @@ on:
         branches: [main, pre-prod]
         paths:
             - "frontend-prep/**"
-            - "docker-pre-prod/frontend/**"
+
     pull_request:
         branches: [main, pre-prod]
         paths:
             - "frontend-prep/**"
-            - "docker-pre-prod/frontend/**"
 
 jobs:
     build: