diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 40de715..18322e8 100755
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -50,7 +50,7 @@ jobs:
           MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         run: |
           cp .env.build .env
-          gem install bundler
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
           sudo /etc/init.d/mysql start
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index aa5b47c..001f987 100755
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -36,9 +36,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.6.x'
+          ruby-version: '2.6.9'
       - uses: actions/cache@v2
         with:
           path: vendor/bundle
@@ -50,7 +50,7 @@ jobs:
           MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         run: |
           cp .env.build .env
-          gem install bundler
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
           sudo /etc/init.d/mysql start
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6971f8d..b4633fd 100755
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
           MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         run: |
           cp .env.build .env
-          gem install bundler
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
           sudo /etc/init.d/mysql start
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e0a9de7..d6c02a6 100755
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,7 +50,7 @@ jobs:
           MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         run: |
           cp .env.build .env
-          gem install bundler
+          gem install bundler -v 2.4.22
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
           sudo /etc/init.d/mysql start
diff --git a/Dockerfile b/Dockerfile
index 2af8748..cf61fc3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,8 +46,8 @@ RUN mkdir -p /home/app/webapp/tmp/pids && \
 
 # Install Ruby gems
 WORKDIR /home/app/webapp
-RUN gem update --system && \
-    gem install bundler:2.3.10 && \
+RUN gem update --system 3.4.22 && \
+    gem install bundler -v 2.4.22 && \
     /sbin/setuser app bundle install --path vendor/bundle
 
 # Add Runit script for shoryuken workers
diff --git a/bin/setup b/bin/setup
index 104e40c..f930d9c 100755
--- a/bin/setup
+++ b/bin/setup
@@ -15,7 +15,7 @@ chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
+  system! "gem install bundler -v 2.4.22 --conservative"
   system('bundle check') || system!('bundle install')
 
 
diff --git a/bin/update b/bin/update
index a8e4462..38337df 100755
--- a/bin/update
+++ b/bin/update
@@ -15,7 +15,7 @@ chdir APP_ROOT do
   # Add necessary update steps to this file.
 
   puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
+  system! "gem install bundler -v 2.4.22 --conservative"
   system('bundle check') || system!('bundle install')
 
   puts "\n== Updating database =="