diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index c846f62..d22e5a4 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -157,5 +157,6 @@ jobs:
         run: tests/config-reloader/test.sh
 
       - name: Cleanup
+        if: always()
         run: |
-          docker stop registry
+          docker rm --force registry
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ce5756..2a55454 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ for the list of changes in SaltStack.
 **3005.1_2**
 
 - CI(tests): Always run tests.
+- CI: Always perform cleanup tasks.
 - CI: Improve build times.
 
 **3005.1_1**