diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index 160cacc97..5de1b981b 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -231,6 +231,9 @@ if [ $? -eq 0 ]; then
 	cat /tmp/syslog_install.log
 fi
 
+#backup copy of Alarm Config File
+/bin/cp -f $installdir/etc/AlarmConfig.xml $installdir/etc/AlarmConfig.xml.installSave > /dev/null 2>&1
+
 #setup alias commands
 eval userhome=~$user
 bashFile=$userhome/.bashrc
diff --git a/oam/install_scripts/pre-uninstall b/oam/install_scripts/pre-uninstall
index 1e50b1a35..8709d369c 100755
--- a/oam/install_scripts/pre-uninstall
+++ b/oam/install_scripts/pre-uninstall
@@ -153,6 +153,7 @@ if [ $quiet != 1 ]; then
 	#make copy of Columnstore.xml
 	/bin/cp -f $installdir/etc/Columnstore.xml $installdir/etc/Columnstore.xml.rpmsave > /dev/null 2>&1
 	/bin/cp -f $installdir/mysql/my.cnf $installdir/mysql/my.cnf.rpmsave > /dev/null 2>&1
+	rm -f $installdir/etc/AlarmConfig.xml.installSave
 fi
 
 #umount file systems
diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index cb02fc091..ba698361f 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -4248,7 +4248,7 @@ bool storageSetup(bool amazonInstall)
 			{}
 	
 			if ( UMVolumeSize.empty() || UMVolumeSize == "" || UMVolumeSize == oam::UnassignedName)
-				UMVolumeSize = "10";
+				UMVolumeSize = minSize;
 
 			while(true)
 			{
@@ -4572,14 +4572,6 @@ bool storageSetup(bool amazonInstall)
 		}
 
 		cout << endl;
-		try {
-			oam.getSystemConfig("PMVolumeSize", PMVolumeSize);
-		}
-		catch(...)
-		{}
-
-		if ( PMVolumeSize.empty() || PMVolumeSize == "" || PMVolumeSize == oam::UnassignedName)
-			PMVolumeSize = "100";
 
 		string minSize = "1";
 		string maxSize = "16384";
@@ -4593,6 +4585,15 @@ bool storageSetup(bool amazonInstall)
       	if (PMVolumeType == "standard")
           	maxSize = "1024";
 
+        try {
+            oam.getSystemConfig("PMVolumeSize", PMVolumeSize);
+        }
+        catch(...)
+        {}
+
+        if ( PMVolumeSize.empty() || PMVolumeSize == "" || PMVolumeSize == oam::UnassignedName)
+            PMVolumeSize = minSize;
+
 		while(true)
 		{
 			string prompt = "Enter EBS Volume storage size in GB: [" + minSize + "," + maxSize + "] (" + PMVolumeSize + ") > ";