diff --git a/.github/workflows/ports_psoc6.yml b/.github/workflows/ports_psoc6.yml
index 6450e7ee51e10..9a937667f991d 100644
--- a/.github/workflows/ports_psoc6.yml
+++ b/.github/workflows/ports_psoc6.yml
@@ -53,7 +53,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Download binaries
       uses: actions/download-artifact@v3
-    - name: Install packages
+    - name: Container setup
       run: |
         echo ${{ secrets.SELF_HOSTED_PASSWORD }} | sudo -S chmod 666 /var/run/docker.sock
         source tools/ci.sh && ci_psoc6_setup
@@ -82,6 +82,10 @@ jobs:
     #   run: | 
     #     cd tests
     #     ./psoc6/run_psoc6_tests.sh -i
+    - name: Container teardown 
+      if: failure() || success()
+      run: |
+        source tools/ci.sh && ci_psoc6_teardown
 
   release:
     runs-on: ubuntu-latest