diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8347965d0..b9f92a247 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/tps
   docker:
-    - image: circleci/ruby:2.5.0-node-browsers
+    - image: circleci/ruby:2.6.0-node-browsers
     - image: circleci/postgres:9.5
       environment:
         POSTGRES_USER: tps_test
diff --git a/.ruby-version b/.ruby-version
index 437459cd9..e70b4523a 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5.0
+2.6.0