diff --git a/Gemfile b/Gemfile
index 951ae73a318..ce5c0aba42f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -311,6 +311,12 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.3'
 gem 'gettext', '~> 3.2.2', require: false, group: :development
 
+# Pin the gems that are needed for the old gettext
+# https://github.com/ruby-gettext/gettext/issues/64 the issue been fixed by upstream in gettext 3.3.0
+gem 'irb', '~> 1.1.0'  # use irb version that matches ruby 2.6. Later irb versions heavily modified its API and it breaks gettext
+gem 'e2mmap' # 'irb' 1.1.1 requires it
+
+
 gem 'batch-loader', '~> 1.4.0'
 
 # Perf bar
@@ -376,7 +382,7 @@ group :development, :test do
   gem 'scss_lint', '~> 0.56.0', require: false
   gem 'haml_lint', '~> 0.34.0', require: false
   gem 'simplecov', '~> 0.16.1', require: false
-  gem 'bundler-audit', '~> 0.5.0', require: false
+  gem 'bundler-audit', '>= 0', require: false # Get the latest gem that is compatible with the new bundler
 
   gem 'benchmark-ips', '~> 2.3.0', require: false