diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6465bc5..8697b50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,10 @@
 image: docker:git
 
+stages:
+  - build
+  - test
+  - automation
+
 services:
 - docker:dind
 
@@ -114,15 +119,13 @@ omnibus-gitlab-xenial: *build_and_deploy
 sitespeed-gitlab: *build_and_deploy
 
 cache-google-chrome:
-  stage: build
+  stage: automation
   variables:
     MOUNT_POINT: /builds/$CI_PROJECT_PATH/mnt
   script:
     - mkdir -p "$MOUNT_POINT"
     - cp scripts/cache-google-chrome $MOUNT_POINT
     - docker run -e "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" -e "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" -v "$MOUNT_POINT:/mnt" ubuntu:16.04 /mnt/cache-google-chrome
-  only:
-    - master
 
 # Old Google Chrome images are listed here for reference: