diff --git a/Gemfile b/Gemfile
index 43b13cef7..0f529fa50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,8 +49,8 @@ gem 'rack-cors', '~> 1.0', '>= 1.0.2', :require => 'rack/cors'
 gem 'strip_attributes', '~> 1.8'
 gem 'slack-notifier', '~> 2.1'
 gem 'mini_magick', '~> 4.8'
-gem 'elasticsearch-model', '~> 5.0', '>= 5.0.2', require: 'elasticsearch/model'
-gem 'elasticsearch-rails', '~> 5.0', '>= 5.0.2'
+gem 'elasticsearch-model', '~> 6.0', '>= 6.0.0', require: 'elasticsearch/model'
+gem 'elasticsearch-rails', '~> 6.0', '>= 6.0.0'
 gem 'faraday_middleware-aws-sigv4', '~> 0.2.4'
 gem 'rack-utf8_sanitizer', '~> 1.6'
 gem 'oj_mimic_json', '~> 1.0', '>= 1.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 994781cf0..952c98bc8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,8 +55,8 @@ GEM
     api-pagination (4.8.2)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.125.0)
-    aws-sdk-core (3.44.0)
+    aws-partitions (1.127.0)
+    aws-sdk-core (3.44.1)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
@@ -177,25 +177,25 @@ GEM
       sxp (~> 1.0)
     edtf (3.0.4)
       activesupport (>= 3.0, < 6.0)
-    elasticsearch (5.0.5)
-      elasticsearch-api (= 5.0.5)
-      elasticsearch-transport (= 5.0.5)
-    elasticsearch-api (5.0.5)
+    elasticsearch (6.1.0)
+      elasticsearch-api (= 6.1.0)
+      elasticsearch-transport (= 6.1.0)
+    elasticsearch-api (6.1.0)
       multi_json
     elasticsearch-extensions (0.0.30)
       ansi
       elasticsearch
-    elasticsearch-model (5.1.0)
+    elasticsearch-model (6.0.0)
       activesupport (> 3)
-      elasticsearch (~> 5)
+      elasticsearch (> 1)
       hashie
-    elasticsearch-rails (5.1.0)
-    elasticsearch-transport (5.0.5)
+    elasticsearch-rails (6.0.0)
+    elasticsearch-transport (6.1.0)
       faraday
       multi_json
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.7.1)
+    erubi (1.8.0)
     excon (0.62.0)
     facets (3.1.0)
     factory_bot (4.11.1)
@@ -235,7 +235,7 @@ GEM
     htmlentities (4.3.4)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.2.0)
+    i18n (1.3.0)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     iso8601 (0.9.1)
@@ -299,7 +299,7 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_magick (4.9.2)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
@@ -365,8 +365,8 @@ GEM
       thor (>= 0.19.0, < 2.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rdf (3.0.7)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
@@ -468,7 +468,7 @@ GEM
     unf_ext (0.0.7.5)
     unicode_utils (1.4.0)
     vcr (3.0.3)
-    webmock (3.4.2)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -507,8 +507,8 @@ DEPENDENCIES
   diffy (~> 3.2, >= 3.2.1)
   dotenv
   elasticsearch-extensions (~> 0.0.29)
-  elasticsearch-model (~> 5.0, >= 5.0.2)
-  elasticsearch-rails (~> 5.0, >= 5.0.2)
+  elasticsearch-model (~> 6.0, >= 6.0.0)
+  elasticsearch-rails (~> 6.0, >= 6.0.0)
   equivalent-xml (~> 0.6.0)
   facets
   factory_bot_rails (~> 4.8, >= 4.8.2)
@@ -556,4 +556,4 @@ DEPENDENCIES
   webmock (~> 3.1)
 
 BUNDLED WITH
-   1.17.1
+   1.17.2
diff --git a/app/models/client.rb b/app/models/client.rb
index 469807ddd..f95284507 100644
--- a/app/models/client.rb
+++ b/app/models/client.rb
@@ -91,7 +91,7 @@ class Client < ActiveRecord::Base
       indexes :created,       type: :date
       indexes :updated,       type: :date
       indexes :deleted_at,    type: :date
-      indexes :cumulative_years, type: :integer, index: "not_analyzed"
+      indexes :cumulative_years, type: :integer, index: "false"
 
       # include parent objects
       indexes :provider,      type: :object
diff --git a/app/models/doi.rb b/app/models/doi.rb
index 85646bf9d..47a361db3 100644
--- a/app/models/doi.rb
+++ b/app/models/doi.rb
@@ -205,7 +205,7 @@ class Doi < ActiveRecord::Base
       lastPage: { type: :keyword }
     }
 
-    indexes :xml,                            type: :text, index: "not_analyzed"
+    indexes :xml,                            type: :text, index: "false"
     indexes :content_url,                    type: :keyword
     indexes :version_info,                   type: :keyword
     indexes :formats,                        type: :keyword
diff --git a/app/models/provider.rb b/app/models/provider.rb
index 9d295b03d..3995e3f9a 100644
--- a/app/models/provider.rb
+++ b/app/models/provider.rb
@@ -98,7 +98,7 @@ class Provider < ActiveRecord::Base
       indexes :created,       type: :date
       indexes :updated,       type: :date
       indexes :deleted_at,    type: :date
-      indexes :cumulative_years, type: :integer, index: "not_analyzed"
+      indexes :cumulative_years, type: :integer, index: "false"
     end
   end
 
diff --git a/docker-compose.yml b/docker-compose.yml
index edd338905..ad7fd4dc2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,7 @@ services:
     networks:
       - public
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
     ports:
       - "9200:9200"
       - "9300:9300"