diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0194300..745063c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,8 @@ stages:
   - template
   - run
   - test
+default:
+  retry: 2
 variables:
   DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG}
   GIT_SUBMODULE_STRATEGY: normal
diff --git a/ci-scripts/gitlab-ci.template b/ci-scripts/gitlab-ci.template
index 939d76f..edc724c 100644
--- a/ci-scripts/gitlab-ci.template
+++ b/ci-scripts/gitlab-ci.template
@@ -11,6 +11,8 @@ stages:
   - scan
   - test
   - manifest
+default:
+  retry: 2
 variables:
   KASM_RELEASE: "{{ KASM_RELEASE }}"
   TEST_INSTALLER: "{{ TEST_INSTALLER }}"
diff --git a/ci-scripts/scan b/ci-scripts/scan
index 31a8249..e270dfa 100644
--- a/ci-scripts/scan
+++ b/ci-scripts/scan
@@ -27,7 +27,7 @@ fi
 
 case "$scan_cmd" in
   repo) options="--scanners config,secret,vuln" ;;
-  image) options="--scanners vuln" ;;
+  image) options="--scanners vuln --timeout 10m" ;;
   *) options="--scanners vuln,config,secret" ;;
 esac