diff --git a/.github/workflows/maze-runner.yml b/.github/workflows/maze-runner.yml
index bf328de2..cf7b0503 100644
--- a/.github/workflows/maze-runner.yml
+++ b/.github/workflows/maze-runner.yml
@@ -142,9 +142,6 @@ jobs:
       matrix:
         ruby-version: ['2.7', '3.3']
         rails-version: ['6', '7']
-        include:
-          - ruby-version: '2.5'
-            rails-version: '6'
         exclude:
           - ruby-version: '2.7'
             rails-version: '6'
diff --git a/docker-compose.yml b/docker-compose.yml
index 94d92034..0dfe972d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.6'
 services:
 
   license_finder:
diff --git a/features/fixtures/docker-compose.yml b/features/fixtures/docker-compose.yml
index d6c7dc58..01bea23e 100644
--- a/features/fixtures/docker-compose.yml
+++ b/features/fixtures/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.6'
 services:
   # dep for job systems
   redis:
diff --git a/features/fixtures/que/app/Gemfile b/features/fixtures/que/app/Gemfile
index 930f3958..717c82c7 100644
--- a/features/fixtures/que/app/Gemfile
+++ b/features/fixtures/que/app/Gemfile
@@ -5,7 +5,18 @@ gem "bugsnag", path: "/bugsnag"
 que_version = ENV.fetch("QUE_VERSION")
 gem "que", "~> #{que_version}"
 
-gem "pg", RUBY_VERSION < "2.2.0" ? "0.21.0" : "> 0.21.0"
+pg_version = if RUBY_VERSION < "2.2.0"
+               "0.21.0"
+             elsif RUBY_VERSION < "2.7.0"
+               # pg 1.6.0 on Linux needs Ruby 2.7
+               "1.5.0"
+             elsif RUBY_VERSION < "3.0.0"
+               # pg 1.6.1 on Linux needs Ruby 3
+               "1.6.0"
+             else
+               "> 1.6.0"
+             end
+gem "pg", pg_version
 
 # Install a compatible Minitest version on Ruby <2.3
 gem 'minitest', '5.11.3' if RUBY_VERSION < '2.3.0'
diff --git a/features/fixtures/rails6/app/Gemfile b/features/fixtures/rails6/app/Gemfile
index a4b41d51..64a5b68c 100644
--- a/features/fixtures/rails6/app/Gemfile
+++ b/features/fixtures/rails6/app/Gemfile
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6'
 # Use sqlite3 as the database for Active Record
-gem 'sqlite3', '~> 1.4.4'
+gem "sqlite3", RUBY_VERSION >= '3.0' ? "~> 1.7" : "< 1.7"
 # Use Puma as the app server
 gem 'puma', '~> 3.11'
 # Use SCSS for stylesheets
diff --git a/features/fixtures/rails7/Dockerfile b/features/fixtures/rails7/Dockerfile
index f60c1aa9..fa4e31f0 100644
--- a/features/fixtures/rails7/Dockerfile
+++ b/features/fixtures/rails7/Dockerfile
@@ -1,12 +1,12 @@
 ARG RUBY_TEST_VERSION
 FROM ruby:$RUBY_TEST_VERSION
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y gnupg
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarn-archive-keyring.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-RUN apt-get install -y nodejs yarn
+RUN apt-get update && apt-get install -y nodejs yarn
 
 WORKDIR /bugsnag
 COPY temp-bugsnag-lib ./
diff --git a/features/fixtures/rails8/Dockerfile b/features/fixtures/rails8/Dockerfile
index 0a271c33..2888432f 100644
--- a/features/fixtures/rails8/Dockerfile
+++ b/features/fixtures/rails8/Dockerfile
@@ -1,12 +1,12 @@
 ARG RUBY_TEST_VERSION
 FROM ruby:$RUBY_TEST_VERSION
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y gnupg
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarn-archive-keyring.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-RUN apt-get install -y nodejs yarn
+RUN apt-get update && apt-get install -y nodejs yarn
 
 WORKDIR /bugsnag
 COPY temp-bugsnag-lib ./
diff --git a/features/fixtures/rails_integrations/Dockerfile b/features/fixtures/rails_integrations/Dockerfile
index 11998a11..3dcfa5a4 100644
--- a/features/fixtures/rails_integrations/Dockerfile
+++ b/features/fixtures/rails_integrations/Dockerfile
@@ -1,12 +1,12 @@
 ARG RUBY_TEST_VERSION
 FROM ruby:$RUBY_TEST_VERSION
 
-RUN apt-get update
+RUN apt-get update && apt-get install -y gnupg
 
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarn-archive-keyring.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-RUN apt-get install -y nodejs yarn
+RUN apt-get update && apt-get install -y nodejs yarn
 
 WORKDIR /bugsnag
 COPY temp-bugsnag-lib ./
diff --git a/features/rails_features/request.feature b/features/rails_features/request.feature
index 7c075bba..5c15e460 100644
--- a/features/rails_features/request.feature
+++ b/features/rails_features/request.feature
@@ -13,7 +13,8 @@ Scenario: Request data is collected automatically
   And the event "metaData.request.clientIp" is not null
   And the event "metaData.request.headers.Host" is not null
   And the event "metaData.request.headers.User-Agent" is not null
-  And the event "metaData.request.headers.Version" is not null
+  # Skipped pending PLAT-15456
+  # And the event "metaData.request.headers.Version" is not null
   And the event "metaData.request.httpMethod" equals "GET"
   And the event "metaData.request.params.action" equals "error"
   And the event "metaData.request.params.controller" equals "unhandled"
@@ -40,7 +41,8 @@ Scenario: Request data can be modified in callbacks
   And the event "metaData.request.clientIp" is not null
   And the event "metaData.request.headers.Host" is not null
   And the event "metaData.request.headers.User-Agent" is not null
-  And the event "metaData.request.headers.Version" is not null
+  # Skipped pending PLAT-15456
+  # And the event "metaData.request.headers.Version" is not null
   And the event "metaData.request.httpMethod" equals "GET"
   And the event "metaData.request.params.action" equals "error"
   And the event "metaData.request.params.controller" equals "unhandled"