diff --git a/oam/etc/Calpont.xml b/oam/etc/Calpont.xml
index 15d224a70..daf4ba68a 100755
--- a/oam/etc/Calpont.xml
+++ b/oam/etc/Calpont.xml
@@ -441,7 +441,7 @@
 		<UMStorageType>internal</UMStorageType>
 		<EEPackageType>rpm</EEPackageType>
 		<SystemLogConfigFile>unassigned</SystemLogConfigFile>
-		<rpw>unassigned</rpw>
+		<rpw>root</rpw>
 		<Cloud>unassigned</Cloud>
 		<AmazonAccessKey>unassigned</AmazonAccessKey>
 		<AmazonSecretKey>unassigned</AmazonSecretKey>
@@ -468,6 +468,7 @@
 		<JavaPath>unassigned</JavaPath>
 		<MySQLPort>3306</MySQLPort>
 		<MySQLPasswordConfig>unassigned</MySQLPasswordConfig>
+		<AmazonDeviceName>/dev/xvd</AmazonDeviceName>
 	</Installation>
 	<ExtentMap>
 		<!--
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index e5371a0d5..b1e5d801e 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -6904,7 +6904,6 @@ namespace oam
 
 	//current amazon max dbroot id support = 190;
 	string PMdeviceName = "/dev/sd";
-	string amazondeviceName = "/dev/xvd";
 	string deviceLetter[] = {"g","h","i","j","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","end"};
 
     /***************************************************************************
@@ -6917,6 +6916,16 @@ namespace oam
 
 	storageID_t Oam::getAWSdeviceName( const int dbrootid)
 	{
+		string amazondeviceName = "/dev/xvd";
+		try {
+			getSystemConfig( "AmazonDeviceName", amazondeviceName );
+		}
+		catch(...)
+		{}
+
+		if ( amazondeviceName.empty() || amazondeviceName == "" )
+			amazondeviceName = "/dev/xvd";
+
 		//calulate id numbers from DBRoot ID
 		int lid = (dbrootid-1) / 10;
 		int did = dbrootid - (dbrootid * lid);
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index c6a65bc34..8495c15c0 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -4561,10 +4561,27 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
 					return API_FAILURE;
 				}
 
+				// add instance tag
+				string systemName;
+				string AmazonAutoTagging;
+				{
+					try{
+						oam.getSystemConfig("SystemName", systemName);
+						oam.getSystemConfig("AmazonAutoTagging", AmazonAutoTagging);
+					}
+					catch(...) {}
+				}
+
+				if ( AmazonAutoTagging == "y" )
+				{
+					string tagValue = systemName + "-" + moduleName;
+					oam.createEC2tag( hostName, "Name", tagValue );
+				}
+
 				//wait until login is success until continuing or fail if can't login
 				log.writeLog(__LINE__, "addModule - Successfully Launch of new Instance, retry login test: " + moduleName, LOG_TYPE_DEBUG);
 				int retry = 0;
-				for (  ; retry < 60 ; retry++)
+				for (  ; retry < 18 ; retry++)
 				{
 					IPAddr = oam.getEC2InstanceIpAddress(hostName);
 					if (IPAddr == "terminated") {
@@ -4597,7 +4614,7 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
 					break;
 				}
 
-				if ( retry >= 60 )
+				if ( retry >= 18 )
 				{
 					log.writeLog(__LINE__, "addModule - Failed to log in to Instance: " + hostName, LOG_TYPE_ERROR);
 					pthread_mutex_unlock(&THREAD_LOCK);
@@ -4606,23 +4623,6 @@ int ProcessManager::addModule(oam::DeviceNetworkList devicenetworklist, std::str
 
 				log.writeLog(__LINE__, "addModule - Successful loggin: " + hostName, LOG_TYPE_DEBUG);
 
-				// add instance tag
-				string systemName;
-				string AmazonAutoTagging;
-				{
-					try{
-						oam.getSystemConfig("SystemName", systemName);
-						oam.getSystemConfig("AmazonAutoTagging", AmazonAutoTagging);
-					}
-					catch(...) {}
-				}
-
-				if ( AmazonAutoTagging == "y" )
-				{
-					string tagValue = systemName + "-" + moduleName;
-					oam.createEC2tag( hostName, "Name", tagValue );
-				}
-
 				log.writeLog(__LINE__, "addModule - Launched new Instance: " + hostName + "/" + IPAddr, LOG_TYPE_DEBUG);
 
 				(*pt1).HostName = hostName;
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index 5af4480a4..fed75c37b 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -1302,7 +1302,7 @@ int main(int argc, char *argv[])
 		string AmazonRegion;
 		string AmazonZone;
 		string AmazonVPCNextPrivateIP;
-
+		string AmazonDeviceName;
 		try {
 			cloud = sysConfigOld->getConfig(InstallSection, "Cloud");
 			x509Cert = sysConfigOld->getConfig(InstallSection, "AmazonX509Certificate");
@@ -1319,6 +1319,7 @@ int main(int argc, char *argv[])
 			AmazonZone = sysConfigOld->getConfig(InstallSection, "AmazonZone");
 			AmazonVPCNextPrivateIP = sysConfigOld->getConfig(InstallSection, "AmazonVPCNextPrivateIP");
 			AmazonSubNetID = sysConfigOld->getConfig(InstallSection, "AmazonSubNetID");
+			AmazonDeviceName = sysConfigOld->getConfig(InstallSection, "AmazonDeviceName");
 		}
 		catch(...)
 		{ }
@@ -1380,6 +1381,7 @@ int main(int argc, char *argv[])
 			sysConfigNew->setConfig(InstallSection, "AmazonAutoTagging", AmazonAutoTagging);
 			sysConfigNew->setConfig(InstallSection, "AmazonRegion", AmazonRegion);
 			sysConfigNew->setConfig(InstallSection, "AmazonZone", AmazonZone);
+			sysConfigNew->setConfig(InstallSection, "AmazonDeviceName", AmazonDeviceName);
 		}
 		catch(...)
 		{