diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 1fa6a1aef0..1cdba539b1 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -283,7 +283,6 @@
+@@ -282,7 +282,6 @@
  gem 'rails-i18n', '~> 5.1'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -10,8 +10,8 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 1.2', '>= 1.2.2'
  
-@@ -305,21 +304,6 @@
-   gem 'raindrops', '~> 0.18'
+@@ -310,21 +309,6 @@
+   gem 'jaeger-client', '~> 0.10.0'
  end
  
 -group :development do
diff --git a/debian/patches/0680-rails-5_2.patch b/debian/patches/0680-rails-5_2.patch
index 7b519a8beb..c2df7937f4 100644
--- a/debian/patches/0680-rails-5_2.patch
+++ b/debian/patches/0680-rails-5_2.patch
@@ -32,15 +32,15 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
      asana (0.8.1)
        faraday (~> 0.9)
        faraday_middleware (~> 0.9)
-@@ -183,7 +183,6 @@
+@@ -184,7 +184,6 @@
      encryptor (3.0.0)
      equalizer (0.0.11)
      erubi (1.7.1)
 -    erubis (2.7.0)
      escape_utils (1.2.1)
-     et-orbi (1.0.3)
+     et-orbi (1.1.7)
        tzinfo
-@@ -253,8 +252,8 @@
+@@ -254,8 +253,8 @@
      fog-xml (0.1.3)
        fog-core
        nokogiri (>= 1.5.11, < 2.0.0)
@@ -51,7 +51,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
      foreman (0.84.0)
        thor (~> 0.19.1)
      formatador (0.2.5)
-@@ -326,8 +325,8 @@
+@@ -330,8 +329,8 @@
      grape-entity (0.7.1)
        activesupport (>= 4.0)
        multi_json (>= 1.3.2)
@@ -62,7 +62,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
        grape (~> 1.0)
        rake (~> 12)
      grape_logging (1.7.0)
-@@ -923,7 +922,7 @@
+@@ -934,7 +933,7 @@
        hashdiff
      webpack-rails (0.9.11)
        railties (>= 3.2.0)
@@ -71,7 +71,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
        websocket-extensions (>= 0.1.0)
      websocket-extensions (0.1.3)
      wikicloth (0.8.1)
-@@ -1021,7 +1020,7 @@
+@@ -1033,7 +1032,7 @@
    gpgme (~> 2.0.18)
    grape (~> 1.1.0)
    grape-entity (~> 0.7.1)
@@ -150,7 +150,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
        metadata: :gzip,
        trace: :raw,
        junit: :gzip,
-@@ -91,7 +91,7 @@
+@@ -93,7 +93,7 @@
  
      enum file_format: {
        raw: 1,