diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 089fb02ca1b..76996a1413e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1292,6 +1292,7 @@ debian-mingw32-x86_64:
     - when: never
   variables:
     GIT_STRATEGY: none
+    JOB_TIMEOUT: 80
 
 # The above .test-manual rules doesn't allow the jobs to be available for MRs
 # but we should have an option to have manual jobs in MRs as well.
@@ -1305,6 +1306,7 @@ debian-mingw32-x86_64:
     - when: never
   variables:
     GIT_STRATEGY: none
+    JOB_TIMEOUT: 80
 
 .baremetal-test:
   extends:
diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index 2596679276c..1d3a2453144 100755
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -34,6 +34,7 @@ artifacts/lava/lava_job_submitter.py \
 	--mesa-build-url "${FDO_HTTP_CACHE_URI:-}https://${MESA_BUILD_PATH}" \
 	--job-rootfs-overlay-url "${FDO_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \
 	--job-artifacts-base ${JOB_ARTIFACTS_BASE} \
+	--job-timeout ${JOB_TIMEOUT:-30} \
 	--first-stage-init artifacts/ci-common/init-stage1.sh \
 	--ci-project-dir ${CI_PROJECT_DIR} \
 	--device-type ${DEVICE_TYPE} \
diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py
index a8f2ace8ded..bf2032c4fe6 100755
--- a/.gitlab-ci/lava/lava_job_submitter.py
+++ b/.gitlab-ci/lava/lava_job_submitter.py
@@ -71,7 +71,7 @@ def generate_lava_yaml(args):
         },
         'timeouts': {
             'job': {
-                'minutes': 30
+                'minutes': args.job_timeout
             }
         },
     }
@@ -111,7 +111,7 @@ def generate_lava_yaml(args):
     # skeleton test definition: only declaring each job as a single 'test'
     # since LAVA's test parsing is not useful to us
     test = {
-      'timeout': { 'minutes': 30 },
+      'timeout': { 'minutes': args.job_timeout },
       'failure_retry': 1,
       'definitions': [ {
         'name': 'mesa',
@@ -332,6 +332,7 @@ if __name__ == '__main__':
     parser.add_argument("--mesa-build-url")
     parser.add_argument("--job-rootfs-overlay-url")
     parser.add_argument("--job-artifacts-base")
+    parser.add_argument("--job-timeout", type=int)
     parser.add_argument("--first-stage-init")
     parser.add_argument("--ci-project-dir")
     parser.add_argument("--device-type")