diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f95ac9fc08..3b53f31f86 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -23,7 +23,9 @@ jobs:
       if: matrix.os == 'macOS-latest'
 
     - name: Build Docker image
-      run: docker-compose -f Dockerfile.yml build sut
+      run: |
+        docker pull linuxbrew/brew
+        docker-compose -f Dockerfile.yml build sut
       if: matrix.os == 'ubuntu-latest'
 
     - name: Run brew test-bot
diff --git a/Dockerfile b/Dockerfile
index 3217d5cad2..819d2d134e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,7 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8 \
 	&& useradd -m -s /bin/bash linuxbrew \
 	&& echo 'linuxbrew ALL=(ALL) NOPASSWD:ALL' >>/etc/sudoers
 ADD . /home/linuxbrew/.linuxbrew/Homebrew
+ARG FORCE_REBUILD
 RUN cd /home/linuxbrew/.linuxbrew \
 	&& mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar \
 	&& ln -s ../Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin/ \
diff --git a/Dockerfile.yml b/Dockerfile.yml
index b147f7c74b..505c28d97b 100644
--- a/Dockerfile.yml
+++ b/Dockerfile.yml
@@ -1,27 +1,35 @@
-sut:
-  build: .
-  command:
-    - sh
-    - -xc
-    - |
-      /home/linuxbrew/.linuxbrew/bin/brew test-bot
-      status=$$?
-      exit $$status
-  environment:
-    # GitHub Actions
-    - GITHUB_ACTIONS
-    - GITHUB_BASE_REF
-    - GITHUB_EVENT_NAME
-    - GITHUB_REF
-    - GITHUB_REPOSITORY
-    - GITHUB_SHA
-    - HEAD_GITHUB_REF
-    # Azure Pipelines
-    - BUILD_REASON
-    - BUILD_REPOSITORY_URI
-    - BUILD_SOURCEVERSION
-    - SYSTEM_PULLREQUEST_PULLREQUESTNUMBER
-    - SYSTEM_PULLREQUEST_TARGETBRANCH
-    - TF_BUILD
-    # GitHub API
-    - HOMEBREW_GITHUB_API_TOKEN
+version: '3.7'
+
+services:
+  sut:
+    build:
+      context: .
+      cache_from:
+        - linuxbrew/brew
+      args:
+        - FORCE_REBUILD=1
+    command:
+      - sh
+      - -xc
+      - |
+        /home/linuxbrew/.linuxbrew/bin/brew test-bot
+        status=$$?
+        exit $$status
+    environment:
+      # GitHub Actions
+      - GITHUB_ACTIONS
+      - GITHUB_BASE_REF
+      - GITHUB_EVENT_NAME
+      - GITHUB_REF
+      - GITHUB_REPOSITORY
+      - GITHUB_SHA
+      - HEAD_GITHUB_REF
+      # Azure Pipelines
+      - BUILD_REASON
+      - BUILD_REPOSITORY_URI
+      - BUILD_SOURCEVERSION
+      - SYSTEM_PULLREQUEST_PULLREQUESTNUMBER
+      - SYSTEM_PULLREQUEST_TARGETBRANCH
+      - TF_BUILD
+      # GitHub API
+      - HOMEBREW_GITHUB_API_TOKEN