diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb
index 2b2a0a1960..bd8b4c460e 100644
--- a/src/cloud/ec2/lib/EC2QueryServer.rb
+++ b/src/cloud/ec2/lib/EC2QueryServer.rb
@@ -218,6 +218,9 @@ class EC2QueryServer < CloudServer
                     OpenNebula::Image::IMAGE_TYPES[0],
                     true)
 
+        # TODO Add AMI Tags
+        # TODO A new persistent image should be created for each instance
+
         if OpenNebula::is_error?(image_id)
             return image_id
         end
diff --git a/src/cloud/ec2/lib/econe_application.rb b/src/cloud/ec2/lib/econe_application.rb
index 7ee84018fa..c6de59116e 100644
--- a/src/cloud/ec2/lib/econe_application.rb
+++ b/src/cloud/ec2/lib/econe_application.rb
@@ -146,8 +146,8 @@ class EC2Application
             result,rc = econe_server.delete_tags(params)
         when 'DescribeTags'
             result,rc = econe_server.describe_tags(params)
-        when 'CreateImage'
-            result,rc = econe_server.create_image(params)
+        #when 'CreateImage'
+        #    result,rc = econe_server.create_image(params)
         when 'CreateVolume'
             result,rc = econe_server.create_volume(params)
         when 'DescribeVolumes'