diff --git a/devops-service/config.rb b/devops-service/config.rb
index 982b00b..60aaf1a 100644
--- a/devops-service/config.rb
+++ b/devops-service/config.rb
@@ -34,6 +34,8 @@ config[:aws_secret_access_key] = "secret_access_key"
 config[:aws_ssh_key]   = "ssh_key"
 config[:aws_certificate]   = "/path/to/.ssh/ec2.pem"
 config[:aws_availability_zone]   = "aws_zone"
+config[:aws_proxy] = ""
+config[:aws_no_proxy] = ""
 
 # static settings
 config[:static_ssh_key]   = "ssh_key" # or nil
diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index f02641d..01a6c92 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -12,11 +12,14 @@ module Provider
     def initialize config
       self.certificate_path = config[:aws_certificate]
       self.ssh_key = config[:aws_ssh_key]
-      self.connection_options = {
+      options = {
         :provider => "aws",
         :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]
+      self.connection_options = options
       self.availability_zone = config[:aws_availability_zone] || "us-east-1a"
       self.run_list = config[:aws_integration_run_list] || []
     end