diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9df786c44..6d95b0310 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,6 +54,12 @@ jobs:
           source activate shpc
           pip install -e .
 
+      - name: Show ${{ matrix.container_tech }} images before install
+        if: (${{ matrix.container_tech == 'podman' }} || ${{matrix.container_tech == "docker"}})
+        run: |
+         ${{ matrix.container_tech }} --version        
+         ${{ matrix.container_tech }} images
+
       - name: Run python module tests (bash)
         shell: bash
         run: |
@@ -101,6 +107,7 @@ jobs:
           grep --quiet 'Python 3.9.5' test_output
           rm test_output
           shpc uninstall --force python:3.9.5-alpine 
+
         
       - name: Run python module tests (tcsh)
         shell: tcsh -e {0}
@@ -144,3 +151,9 @@ jobs:
           grep --quiet 'Python 3.9.5' test_output
           rm test_output
           shpc uninstall --force python:3.9.5-alpine
+
+      - name: Show ${{ matrix.container_tech }} images after install
+        if: (${{ matrix.container_tech == 'podman' }} || ${{matrix.container_tech == "docker"}})
+        run: |
+          ${{ matrix.container_tech }} --version        
+          ${{ matrix.container_tech }} images          
diff --git a/shpc/main/client.py b/shpc/main/client.py
index cda45c384..6daf007c3 100644
--- a/shpc/main/client.py
+++ b/shpc/main/client.py
@@ -177,6 +177,7 @@ def cleanup(tmpdir):
         if stage:
             logger.info(tmpdir)
         else:
+            self.uninstall("%s:%s" % (module_name, tag), force=True)
             cleanup(tmpdir)
 
     def check(self, module_name):