diff --git a/runtime/hsa-runtime/DEBIAN/Dev/prerm.in b/runtime/hsa-runtime/DEBIAN/Dev/prerm.in
index 63e2fd5ef4..7f978e3f0c 100644
--- a/runtime/hsa-runtime/DEBIAN/Dev/prerm.in
+++ b/runtime/hsa-runtime/DEBIAN/Dev/prerm.in
@@ -45,8 +45,10 @@
 set -e
 
 case "$1" in
-   ( remove )
+   ( remove | upgrade )
        # Workaround for CPACK directory symlink handling error.
+       # Needed for remove and upgrade scenarios since
+       # upgrade installs to new folder and old folders need to be cleaned
        rm -rf @CPACK_PACKAGING_INSTALL_PREFIX@/hsa
    ;;
    ( * )
diff --git a/runtime/hsa-runtime/RPM/Dev/postun.in b/runtime/hsa-runtime/RPM/Dev/postun.in
index 34c2ebb59f..0e7ed27d6e 100644
--- a/runtime/hsa-runtime/RPM/Dev/postun.in
+++ b/runtime/hsa-runtime/RPM/Dev/postun.in
@@ -40,7 +40,9 @@
 ##
 ################################################################################
 
-if [ $1 -eq 0 ]; then
+if [ $1 -le 1 ]; then
   # Workaround for CPACK directory symlink handling error.
+  # Needed for uninstall and upgrade scenarios since
+  # upgrade install to new folder and old folders need to be cleaned
   rm -rf @CPACK_PACKAGING_INSTALL_PREFIX@/hsa
 fi