diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9df786c44..534624e90 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,6 +77,14 @@ jobs:
           printf "\n\shpc test ============================================\n"
           shpc test python:3.9.5-alpine          
 
+          if [ "${{ matrix.container_tech }}" == "podman" ]; then
+              printf "Podman images before install\n"
+              podman images          
+          elif [ "${{ matrix.container_tech }}" == "docker" ]; then
+              printf "Docker images before install\n"
+              docker images 
+          done
+
           shpc install python:3.9.5-alpine
 
           module use ./modules
@@ -101,6 +109,14 @@ jobs:
           grep --quiet 'Python 3.9.5' test_output
           rm test_output
           shpc uninstall --force python:3.9.5-alpine 
+
+          if [ "${{ matrix.container_tech }}" == "podman" ]; then
+              printf "Podman images after uninstall\n"
+              podman images          
+          elif [ "${{ matrix.container_tech }}" == "docker" ]; then
+              printf "Docker images after uninstall\n"
+              docker images 
+          done
         
       - name: Run python module tests (tcsh)
         shell: tcsh -e {0}
@@ -120,6 +136,14 @@ jobs:
           shpc config set module_sys:${{ matrix.module }}
           shpc config set enable_tty:false
 
+          if [ "${{ matrix.container_tech }}" == "podman" ]; then
+              printf "Podman images before install\n"
+              podman images          
+          elif [ "${{ matrix.container_tech }}" == "docker" ]; then
+              printf "Docker images before install\n"
+              docker images 
+          done
+
           shpc install python:3.9.5-alpine
 
           module use ./modules
@@ -144,3 +168,12 @@ jobs:
           grep --quiet 'Python 3.9.5' test_output
           rm test_output
           shpc uninstall --force python:3.9.5-alpine
+
+          if [ "${{ matrix.container_tech }}" == "podman" ]; then
+              printf "Podman images after uninstall\n"
+              podman images          
+          elif [ "${{ matrix.container_tech }}" == "docker" ]; then
+              printf "Docker images after uninstall\n"
+              docker images 
+          done
+          
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):