diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 27c6346584..7948132c62 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -174,30 +174,27 @@ jobs:
 
     - name: Build Docker image
       if: matrix.os == 'ubuntu-latest'
-      run: |
-        docker pull homebrew/brew
-        docker-compose -f Dockerfile.yml build sut
+      run: docker build -t brew .
 
     - name: Run brew test-bot
       run: |
         if [ "$RUNNER_OS" = "Linux" ]; then
-          docker-compose -f Dockerfile.yml run --rm -v $GITHUB_WORKSPACE:/tmp/test-bot sut
-          docker tag homebrew_sut brew
+          docker run --rm brew brew test-bot
         else
           brew test-bot
         fi
 
-    - name: Deploy the latest Docker image to GitHub
-      if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
+    - name: Deploy the Docker image to GitHub and Docker Hub
+      if: matrix.os == 'ubuntu-latest' && (github.ref == 'refs/heads/master' || github.event_name == 'release')
       run: |
+        case $GITHUB_REF in
+          refs/heads/master) v=latest ;;
+          refs/tags/*) v=${GITHUB_REF:10} ;;
+          *) echo Error: unexpected GITHUB_REF: $GITHUB_REF; exit 1 ;;
+        esac
         docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
-        docker tag brew docker.pkg.github.com/homebrew/brew/brew
-        docker push docker.pkg.github.com/homebrew/brew/brew
-
-    - name: Deploy the tagged Docker image to GitHub
-      if: matrix.os == 'ubuntu-latest' && startsWith(github.ref, 'refs/tags/')
-      run: |
-        docker login docker.pkg.github.com -u BrewTestBot -p ${{secrets.GITHUB_TOKEN}}
-        v=${GITHUB_REF:10}
         docker tag brew "docker.pkg.github.com/homebrew/brew/brew:$v"
         docker push "docker.pkg.github.com/homebrew/brew/brew:$v"
+        docker login docker.com -u brewtestbot -p ${{secrets.DOCKER_TOKEN}}
+        docker tag "brew homebrew/brew:$v"
+        docker push "homebrew/brew:$v"
diff --git a/Dockerfile.yml b/Dockerfile.yml
deleted file mode 100644
index ac02ce9147..0000000000
--- a/Dockerfile.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3.7'
-
-services:
-  sut:
-    build:
-      context: .
-      cache_from:
-        - homebrew/brew
-      args:
-        - FORCE_REBUILD=1
-    command:
-      - sh
-      - -xc
-      - |
-        /home/linuxbrew/.linuxbrew/bin/brew test-bot
-        status=$$?
-        exit $$status