diff --git a/Gemfile b/Gemfile
index 84f8492211cc16db7added0f23e6cd6bcca1796a..3b82636928476d333bfcb50174446b827f2f8b24 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,12 +13,14 @@ gem "dhall", ">= 0.5.3.fixed"
 gem "em-http-request"
 gem "em_promise.rb"
 gem "em-synchrony"
+gem "faraday-em_http", git: "https://github.com/Amolith/faraday-em_http", branch: "fix-gzip"
+gem "faraday-em_synchrony", git: "https://github.com/Amolith/faraday-em_synchrony", branch: "update-for-faraday-2"
 gem "mail"
 gem "money-open-exchange-rates"
 gem "pg"
 gem "redis"
 gem "roda"
-gem "ruby-bandwidth-iris", git: "https://github.com/singpolyma/ruby-bandwidth-iris", branch: "list-port-ins"
+gem "ruby-bandwidth-iris", "~> 7.4"
 gem "sentry-ruby"
 gem "slim"
 
diff --git a/bin/active_tels_on_catapult b/bin/active_tels_on_catapult
index 50caefe8d8605b9cb00ade8bb3edfd9f79c9f594..ebed26ca6fb41d1f988d3bed1cf1abf946517560 100755
--- a/bin/active_tels_on_catapult
+++ b/bin/active_tels_on_catapult
@@ -13,8 +13,8 @@ CONFIG = Dhall.load(ARGV[0]).sync
 
 BandwidthIris::Client.global_options = {
 	account_id: CONFIG[:creds][:account],
-	username: CONFIG[:creds][:username],
-	password: CONFIG[:creds][:password]
+	client_id: CONFIG[:creds][:client_id],
+	client_secret: CONFIG[:creds][:client_secret]
 }
 
 REDIS = Redis.new
diff --git a/bin/cancel_expired_customers b/bin/cancel_expired_customers
index 7b130545bcc15d55ccd4e295d821a74e072c8002..8f36b67a83dad3d2b8bd747ba2543681bc236be9 100755
--- a/bin/cancel_expired_customers
+++ b/bin/cancel_expired_customers
@@ -5,6 +5,7 @@ require "date"
 require "dhall"
 require "em_promise"
 require "pg"
+require "faraday/em_synchrony"
 require "ruby-bandwidth-iris"
 require "set"
 
@@ -16,8 +17,8 @@ CONFIG = Dhall.load(<<-DHALL).sync
 		sgx_jmp: Text,
 		creds: {
 			account: Text,
-			username: Text,
-			password: Text
+			client_id: Text,
+			client_secret: Text
 		},
 		notify_using: {
 			jid: Text,
@@ -32,8 +33,8 @@ DHALL
 Faraday.default_adapter = :em_synchrony
 BandwidthIris::Client.global_options = {
 	account_id: CONFIG[:creds][:account],
-	username: CONFIG[:creds][:username],
-	password: CONFIG[:creds][:password]
+	client_id: CONFIG[:creds][:client_id],
+	client_secret: CONFIG[:creds][:client_secret]
 }
 
 using ToForm