diff --git a/Gemfile b/Gemfile
index 64a1a2d3..fb4bfe46 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,9 @@ gemspec
 # Proper open-source dependencies of the RightLink gem
 gem 'right_support', '~> 2.8'
 
-gem 'right_agent', '~> 2.4.0'
+gem 'right_agent', '~> 2.4.0',
+  :git => 'https://github.com/rightscale/right_agent',
+  :branch => 'ivory_15_02_IV-743_fix_up_proxy_configuration'
 
 gem 'right_amqp', '~> 0.7'
 gem 'right_popen', '~> 2.0'
@@ -23,7 +25,8 @@ gem 'fiber_pool',      '1.0.0'
 gem 'net-dhcp',        '~> 1.3'
 
 # 0.5.1 break rightlink, interface changes
-gem 'websocket-driver', '~>0.3.5'
+# 0.3.5 doesn't support http proxies -- try 0.4.0 until we can fix up RL as well
+gem 'websocket-driver', '~>0.4.0'
 
 
 gem 'mixlib-authentication', ">= 1.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index f3633409..88c19f1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,6 +10,22 @@ GIT
       eventmachine (>= 1.0.3)
       http_parser.rb (>= 0.6.0)
 
+GIT
+  remote: https://github.com/rightscale/right_agent
+  revision: d7d9f7226fd903b2e0714c6276c297918b3ed33a
+  branch: ivory_15_02_IV-743_fix_up_proxy_configuration
+  specs:
+    right_agent (2.4.5)
+      eventmachine (>= 0.12.10, < 2.0)
+      faye-websocket (~> 0.8.0)
+      ffi
+      json (~> 1.4)
+      msgpack (>= 0.4.4, < 0.6)
+      net-ssh (~> 2.0)
+      rest-client (~> 1.7.0.3)
+      right_amqp (~> 0.8)
+      right_support (>= 2.4.1, < 3.0)
+
 PATH
   remote: .
   specs:
@@ -93,9 +109,9 @@ GEM
     erubis (2.7.0)
     eventmachine (1.0.7)
     extlib (0.9.16)
-    faye-websocket (0.7.5)
+    faye-websocket (0.8.0)
       eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.3.5)
+      websocket-driver (>= 0.4.0)
     ffi (1.1.0)
     ffi (1.1.0-x86-mingw32)
     fiber_pool (1.0.0)
@@ -146,28 +162,6 @@ GEM
       mime-types (>= 1.16)
       net-http-persistent
       netrc (~> 0.7.7)
-    right_agent (2.4.5)
-      eventmachine (>= 0.12.10, < 2.0)
-      faye-websocket (~> 0.7.0)
-      ffi
-      json (~> 1.4)
-      msgpack (>= 0.4.4, < 0.6)
-      net-ssh (~> 2.0)
-      rest-client (~> 1.7.0.3)
-      right_amqp (~> 0.8)
-      right_support (>= 2.4.1, < 3.0)
-    right_agent (2.4.5-x86-mingw32)
-      eventmachine (>= 0.12.10, < 2.0)
-      faye-websocket (~> 0.7.0)
-      ffi
-      json (~> 1.4)
-      msgpack (>= 0.4.4, < 0.6)
-      net-ssh (~> 2.0)
-      rest-client (~> 1.7.0.3)
-      right_amqp (~> 0.8)
-      right_support (>= 2.4.1, < 3.0)
-      win32-dir (>= 0.3.5)
-      win32-process (>= 0.6.1)
     right_amqp (0.8.6)
       eventmachine (>= 0.12.10, < 2.0)
       right_support (>= 1.2, < 3.0)
@@ -204,7 +198,7 @@ GEM
       power_assert
     trollop (2.1.1)
     uuidtools (2.1.5)
-    websocket-driver (0.3.5)
+    websocket-driver (0.4.0)
     win32-api (1.4.8-x86-mingw32)
     win32-dir (0.3.7)
       windows-pr (>= 1.0.9)
@@ -252,7 +246,7 @@ DEPENDENCIES
   rake (~> 10.0)
   rb-readline (~> 0.5.0)
   rest-client (= 1.7.0.4)
-  right_agent (~> 2.4.0)
+  right_agent (~> 2.4.0)!
   right_amqp (~> 0.7)
   right_develop (~> 3.1)
   right_git
@@ -263,7 +257,7 @@ DEPENDENCIES
   rspec (~> 1.3)
   ruby-debug
   rubyforge (= 1.0.4)
-  websocket-driver (~> 0.3.5)
+  websocket-driver (~> 0.4.0)
   win32-dir
   win32-pipe
   win32-process