diff --git a/debian/gitlab.install b/debian/gitlab.install
index 37bcd47ce3..c7fc4aa090 100644
--- a/debian/gitlab.install
+++ b/debian/gitlab.install
@@ -68,3 +68,4 @@ derailed-benchmarks usr/share/gitlab/vendor/gems
 heapy usr/share/gitlab/vendor/gems
 elasticsearch-model usr/share/gitlab/vendor/gems
 elasticsearch-rails usr/share/gitlab/vendor/gems
+faraday-middleware-aws-signers-v4 usr/share/gitlab/vendor/gems
diff --git a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch
new file mode 100644
index 0000000000..5c2a5bc917
--- /dev/null
+++ b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch
@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -131,7 +131,7 @@
+ gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
+ gem 'elasticsearch-api',   '~> 5.0', '>= 5.0.3'
+ gem 'aws-sdk'
+-gem 'faraday_middleware-aws-signers-v4'
++gem 'faraday_middleware-aws-signers-v4', path: 'vendor/gems/faraday-middleware-aws-signers-v4'
+ 
+ # Markdown and HTML processing
+ gem 'html-pipeline', '~> 2.8'
diff --git a/debian/patches/series b/debian/patches/series
index 3ecc29bfac..0e65bb0595 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@
 0470-relax-bootsnap.patch
 0480-embed-elasticsearch-model.patch
 0480-embed-elasticsearch-rails.patch
+0480-embed-faraday-middleware-aws-signers-v4.patch
 0482-remove-ee-only-gems.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
diff --git a/debian/upstream-file-list b/debian/upstream-file-list
index 3b76f75fff..8e9f47c735 100644
--- a/debian/upstream-file-list
+++ b/debian/upstream-file-list
@@ -69,6 +69,7 @@ docker
 docker-compose.yml
 elasticsearch-model
 elasticsearch-rails
+faraday-middleware-aws-signers-v4
 fixtures
 generator_templates
 haml_lint