diff --git a/.gitlab/templates/pipeline.yaml.tpl b/.gitlab/templates/pipeline.yaml.tpl
index 2e37246b5..6b2938221 100644
--- a/.gitlab/templates/pipeline.yaml.tpl
+++ b/.gitlab/templates/pipeline.yaml.tpl
@@ -52,9 +52,9 @@ bottlecap ({{ $flavor.name }}):
   image: registry.ddbuild.io/images/docker:20.10
   tags: ["arch:{{ $flavor.arch }}"]
   needs: []
-  # This job sometimes times out on GitLab for unclear reason.
-  # Set a short timeout with retries to work around this.
-  timeout: 10m
+  # This job sometimes times out on GitLab for unclear reasons.
+  # Set a timeout with retries to work around this.
+  timeout: 20m
   retry:
     max: 2
     when:
@@ -464,6 +464,7 @@ integration-suite:
   stage: integration-tests
   tags: ["arch:amd64"]
   image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
+  retry: 2
   parallel:
     matrix:
       - TEST_SUITE: {{ range (ds "test_suites").test_suites }}