diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
index a13e080b7e4..22deccffdd5 100644
--- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java
+++ b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
@@ -108,7 +108,7 @@ public class TrafficSentinelResource implements ServerResource {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(TrafficSentinelResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);		
     	return new StartupCommand[]{cmd};
     }
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index a444cfec197..dd917f75a6e 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3984,7 +3984,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
         cmd.setHypervisorType(HypervisorType.VMware);
         cmd.setStateChanges(changes);
         cmd.setCluster(_cluster);
-        cmd.setVersion(hostApiVersion);
+        cmd.setHypervisorVersion(hostApiVersion);
 
         List<StartupStorageCommand> storageCmds = initializeLocalStorage();
         StartupCommand[] answerCmds = new StartupCommand[1 + storageCmds.size()];
diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
index c9c3711bfc1..80a7a85dc85 100644
--- a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
+++ b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
@@ -196,7 +196,7 @@ public class F5BigIpResource implements ServerResource {
 		cmd.setPod("");
     	cmd.setPrivateIpAddress(_ip);
     	cmd.setStorageIpAddress("");
-    	cmd.setVersion("");
+    	cmd.setVersion(F5BigIpResource.class.getPackage().getImplementationVersion());
     	cmd.setGuid(_guid);
     	return new StartupCommand[]{cmd};
     }
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index f823ab8af4f..11ff2960e4b 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -447,7 +447,7 @@ public class JuniperSrxResource implements ServerResource {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(JuniperSrxResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);
         return new StartupCommand[]{cmd};
     }
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index afb01353e1e..ca8c8a71c7d 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -369,7 +369,7 @@ public class NetscalerResource implements ServerResource {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(NetscalerResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);
         return new StartupCommand[]{cmd};
     }
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
index 12ed72a1fd5..027f451b154 100644
--- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
+++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
@@ -166,7 +166,7 @@ public class NiciraNvpResource implements ServerResource {
         sc.setPod("");
         sc.setPrivateIpAddress("");
         sc.setStorageIpAddress("");
-        sc.setVersion("");
+        sc.setVersion(NiciraNvpResource.class.getPackage().getImplementationVersion());
         return new StartupCommand[] { sc };
     }
 
diff --git a/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java b/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java
index cbfcfd15f9a..69846ac4ec4 100644
--- a/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java
+++ b/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java
@@ -127,7 +127,7 @@ public class ExternalDhcpResourceBase implements ServerResource {
 		cmd.setPod(_podId);
 		cmd.setPrivateIpAddress(_ip);
 		cmd.setStorageIpAddress("");
-		cmd.setVersion("");
+		cmd.setVersion(ExternalDhcpResourceBase.class.getPackage().getImplementationVersion());
 		cmd.setGuid(_guid);
 		return new StartupCommand[]{cmd};
 	}
diff --git a/server/src/com/cloud/baremetal/PxeServerResourceBase.java b/server/src/com/cloud/baremetal/PxeServerResourceBase.java
index c307ccfc111..46982b1942a 100644
--- a/server/src/com/cloud/baremetal/PxeServerResourceBase.java
+++ b/server/src/com/cloud/baremetal/PxeServerResourceBase.java
@@ -114,7 +114,7 @@ public class PxeServerResourceBase implements ServerResource {
 		cmd.setPod(_podId);
 		cmd.setPrivateIpAddress(_ip);
 		cmd.setStorageIpAddress("");
-		cmd.setVersion("");
+		cmd.setVersion(PxeServerResourceBase.class.getPackage().getImplementationVersion());
 		cmd.setGuid(_guid);
 		return new StartupCommand[]{cmd};
 	}
diff --git a/server/src/com/cloud/resource/DummyHostServerResource.java b/server/src/com/cloud/resource/DummyHostServerResource.java
index 5144a91a3ec..d300f6b71ea 100644
--- a/server/src/com/cloud/resource/DummyHostServerResource.java
+++ b/server/src/com/cloud/resource/DummyHostServerResource.java
@@ -91,7 +91,7 @@ public class DummyHostServerResource extends ServerResourceBase {
         cmd.setPublicIpAddress(getHostStoragePrivateIp());
         cmd.setPublicMacAddress(getHostStorageMacAddress().toString());
         cmd.setPublicNetmask("255.255.0.0");
-        cmd.setVersion("1.0");
+        cmd.setVersion(DummyHostServerResource.class.getPackage().getImplementationVersion());
 
         return new StartupCommand[] {cmd};
 	}
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index ffc09f0effe..b6ee747bee9 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1772,6 +1772,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
         host.setTotalMemory(ssCmd.getMemory());
         host.setSpeed(ssCmd.getSpeed());
         host.setHypervisorType(hyType);
+        host.setHypervisorVersion(ssCmd.getHypervisorVersion());
         return host;
     }