diff --git a/.github/workflows/testflow.yml b/.github/workflows/testflow.yml
index 082f28566..8a57dac4f 100644
--- a/.github/workflows/testflow.yml
+++ b/.github/workflows/testflow.yml
@@ -514,6 +514,15 @@ jobs:
           name: "Jepsen Report"
           path: tests/jepsen/Jepsen.tar.gz
 
+      - name: Stop mgbuild container
+        if: always()
+        run: |
+          ./release/package/run2.sh \
+          --toolchain $TOOLCHAIN \
+          --os $OS \
+          --arch $ARCH \
+          stop --remove
+
   release_benchmarks:
     name: "Release benchmarks"
     runs-on: [self-hosted, Linux, X64, DockerMgBuild, Gen7]