diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8911c3644c..2711463032 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -97,7 +97,7 @@ jobs:
 
   "jruby":
     docker:
-       - image: jruby:9.1.16.0-jdk-alpine
+       - image: circleci/jruby:9.1.16.0-jdk
     working_directory: ~/repo
     steps:
       - checkout
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5609f18f20..2866a1188d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
 ### Changed
 
 * Add Rubocop to default Rake task ([#1256](https://github.com/cucumber/cucumber-ruby/pull/1256) [@jaysonesmith](https://github.com/jaysonesmith))
+* Upgraded `cucumber-expressions` dependency to ~> 6.0.0 ([#1299](https://github.com/cucumber/cucumber-ruby/pull/1299) [@aslakhellesoy](https://github.com/aslakhellesoy))
+* Upgraded to `gherkin` 5.1.0 ([#1299](https://github.com/cucumber/cucumber-ruby/pull/1299) [@aslakhellesoy](https://github.com/aslakhellesoy))
 
 ### Deprecated
 
diff --git a/cucumber.gemspec b/cucumber.gemspec
index f3fd1804de..905c158813 100644
--- a/cucumber.gemspec
+++ b/cucumber.gemspec
@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.2'
   s.add_dependency 'builder', '>= 2.1.2'
   s.add_dependency 'cucumber-core', '~> 3.1.0'
-  s.add_dependency 'cucumber-expressions', '~> 5.0.14'
+  s.add_dependency 'cucumber-expressions', '~> 6.0.0'
   s.add_dependency 'cucumber-wire', '~> 0.0.1'
   s.add_dependency 'diff-lcs', '~> 1.3'
-  s.add_dependency 'gherkin', '~> 5.0'
+  s.add_dependency 'gherkin', '~> 5.1.0'
   s.add_dependency 'multi_json', '>= 1.7.5', '< 2.0'
   s.add_dependency 'multi_test', '>= 0.1.2'