diff --git a/src/mad/ruby/PublicCloudDriver.rb b/src/mad/ruby/PublicCloudDriver.rb
index bab42d9d70..25163181a3 100644
--- a/src/mad/ruby/PublicCloudDriver.rb
+++ b/src/mad/ruby/PublicCloudDriver.rb
@@ -249,7 +249,9 @@ class InstanceCache
     def select_vms
         vms = []
         execute_retry('SELECT * from vms').each do |vm|
-            vms << Hash[[:uuid, :id, :name, :state, :type].zip(vm)]
+            vm = Hash[[:uuid, :id, :name, :state, :type].zip(vm)]
+            vm[:deploy_id] = vm[:uuid]
+            vms << vm
         end
 
         vms