diff --git a/src/cloud/ec2/lib/ImageEC2.rb b/src/cloud/ec2/lib/ImageEC2.rb
index e34da8127d..a8749dc7bc 100644
--- a/src/cloud/ec2/lib/ImageEC2.rb
+++ b/src/cloud/ec2/lib/ImageEC2.rb
@@ -14,13 +14,13 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-require 'uuid'
+require 'uuidtools'
 require 'OpenNebula'
 
 include OpenNebula
 
 class ImageEC2 < Image
-    
+
     ONE_IMAGE = %q{
         NAME = "ec2-<%= uuid %>"
         TYPE = OS
@@ -40,9 +40,9 @@ class ImageEC2 < Image
     end
 
     def to_one_template()
-        uuid = UUID.generate
-        
+        uuid = UUIDTools::UUID.random_create.to_s
+
         one = ERB.new(ONE_IMAGE)
         return one.result(binding)
     end
-end
\ No newline at end of file
+end