diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb
index 0134b8c..9505734 100644
--- a/lib/vmpooler/api/v1.rb
+++ b/lib/vmpooler/api/v1.rb
@@ -340,6 +340,7 @@ module Vmpooler
             unless vm.nil?
               $redis.sadd('vmpooler__running__' + key, vm)
               $redis.hset('vmpooler__active__' + key, vm, Time.now)
+              $redis.hset('vmpooler__vm__' + vm, 'checkout', Time.now)
 
               result[key] ||= {}
 
@@ -403,6 +404,7 @@ module Vmpooler
           unless vm.nil?
             $redis.sadd('vmpooler__running__' + template, vm)
             $redis.hset('vmpooler__active__' + template, vm, Time.now)
+            $redis.hset('vmpooler__vm__' + vm, 'checkout', Time.now)
 
             result[template] ||= {}
 
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index 542c75c..9fd35ed 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -256,7 +256,7 @@ module Vmpooler
       Thread.new do
         $redis.srem('vmpooler__completed__' + pool, vm)
         $redis.hdel('vmpooler__active__' + pool, vm)
-        $redis.del('vmpooler__vm__' + vm)
+        $redis.hset('vmpooler__vm__' + vm, 'destroy', Time.now)
 
         host = $vsphere[pool].find_vm(vm) ||
                $vsphere[pool].find_vm_heavy(vm)[vm]