diff --git a/lib/fog/xenserver/models/compute/servers.rb b/lib/fog/xenserver/models/compute/servers.rb
index a0008cf1b..345a5ae45 100644
--- a/lib/fog/xenserver/models/compute/servers.rb
+++ b/lib/fog/xenserver/models/compute/servers.rb
@@ -10,7 +10,11 @@ module Fog
         model Fog::Compute::XenServer::Server
 
         def templates
-          custom_templates + builtin_templates
+          data = connection.get_records 'VM'
+          data.delete_if do |vm|
+            !vm[:is_a_template]
+          end
+          load(data)
         end
 
         def custom_templates