diff --git a/.ruby-version b/.ruby-version
index aedc15bb0c..e70b4523ae 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5.3
+2.6.0
diff --git a/.travis.yml b/.travis.yml
index c2df146c71..25b232881a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ rvm:
   - '2.3.8'
   - '2.4.5'
   - '2.5.3'
+  - '2.6.0'
 
 env:
   - CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"'
diff --git a/Dockerfile b/Dockerfile
index a6b4b2ebf5..22843626a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5.3-alpine3.7 AS builder
+FROM ruby:2.6.0-alpine3.8 AS builder
 LABEL maintainer="Rapid7"
 
 ARG BUNDLER_ARGS="--jobs=8 --without development test coverage"
@@ -37,7 +37,7 @@ RUN apk add --no-cache \
     && chmod -R a+r /usr/local/bundle
 
 
-FROM ruby:2.5.3-alpine3.7
+FROM ruby:2.6.0-alpine3.8
 LABEL maintainer="Rapid7"
 
 ENV APP_HOME=/usr/src/metasploit-framework