diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index 01a6c92..118b60d 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -17,8 +17,12 @@ module Provider
         :aws_access_key_id => config[:aws_access_key_id],
         :aws_secret_access_key => config[:aws_secret_access_key]
       }
-      options[:proxy] = config[:aws_proxy] if config[:aws_proxy]
-      options[:no_proxy] = config[:no_proxy] if config[:no_proxy]
+      if config[:aws_proxy] and config[:aws_no_proxy]
+        options[:connection_options] = {
+          :proxy => config[:aws_proxy],
+          :no_proxy => config[:no_proxy]
+        }
+      end
       self.connection_options = options
       self.availability_zone = config[:aws_availability_zone] || "us-east-1a"
       self.run_list = config[:aws_integration_run_list] || []