diff --git a/bin/oncall/download-piv-certs b/bin/oncall/download-piv-certs
index 1ddf54d81dc..b0dcac50158 100755
--- a/bin/oncall/download-piv-certs
+++ b/bin/oncall/download-piv-certs
@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+Dir.chdir(__dir__) { require 'bundler/setup' }
+
 require 'active_support'
 require 'active_support/core_ext/enumerable' # index_by
 require 'active_support/core_ext/integer/time'
diff --git a/bin/oncall/email-deliveries b/bin/oncall/email-deliveries
index 0272438f9c4..f55cff8d558 100755
--- a/bin/oncall/email-deliveries
+++ b/bin/oncall/email-deliveries
@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+Dir.chdir(__dir__) { require 'bundler/setup' }
+
 require 'active_support'
 require 'active_support/core_ext/enumerable' # index_by
 require 'active_support/core_ext/integer/time'
diff --git a/bin/oncall/otp-deliveries b/bin/oncall/otp-deliveries
index 8972196f44c..2f9d28b5cae 100755
--- a/bin/oncall/otp-deliveries
+++ b/bin/oncall/otp-deliveries
@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+Dir.chdir(__dir__) { require 'bundler/setup' }
+
 require 'active_support'
 require 'active_support/core_ext/integer/time'
 require 'optparse'
diff --git a/bin/query-cloudwatch b/bin/query-cloudwatch
index 370494949bb..d8848e1193b 100755
--- a/bin/query-cloudwatch
+++ b/bin/query-cloudwatch
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-Dir.chdir(File.dirname(__FILE__)) { require 'bundler/setup' }
+Dir.chdir(__dir__) { require 'bundler/setup' }
 
 require 'active_support'
 require 'active_support/core_ext/integer/time'
diff --git a/lib/reporting/cloudwatch_client.rb b/lib/reporting/cloudwatch_client.rb
index ea1d0b9aae5..41d91bce456 100644
--- a/lib/reporting/cloudwatch_client.rb
+++ b/lib/reporting/cloudwatch_client.rb
@@ -1,5 +1,6 @@
 require 'aws-sdk-cloudwatchlogs'
 require 'ruby-progressbar'
+require 'identity/hostdata'
 
 module Reporting
   class CloudwatchClient