diff --git a/.gitignore b/.gitignore
index 3590ef83894fe39586bc6a9dee6612cd98a523ff..ef8138eeeee7fd7ce6c17a0406446afab04fd437 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
 npm-debug.log
 .bash_history
 .cache
-build/
+/build
 .guard_history
 yarn-error.log
+/vendor/bundle
diff --git a/.ruby-version b/.ruby-version
index 6bf7c6fa4e414fe42f2751c6805ba76091023239..4560fb912c0b7c6f030fe67e0f2384c1401f2bae 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-2.5.1
+ruby-2.6.3
diff --git a/Dockerfile b/Dockerfile
index e86007ad54df4da7b6209eb642a68ccc4fc93b07..c49578febd088be1e8f2d99020624824b60b7d22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5.1
+FROM ruby:2.6.3
 
 RUN apt-get -y update && apt-get -y upgrade
 
diff --git a/Gemfile b/Gemfile
index 2f3cbc3acca421a61cee2f0a7dceecb9c91b3767..8e641f286aa8a90a2339ebbafea82b7400e3e25c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '2.5.1'
+ruby '2.6.3'
 
 gem 'activesupport'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3482a0d0e68044a51ffd1684c25a867fb25e2ba2..817311629db93dfc6c4334e45604089b7e9d8dab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,7 +15,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.3.0)
-    ffi (1.9.23)
+    ffi (1.11.1)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -117,7 +117,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.5.1p57
+   ruby 2.6.3p62
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/README.md b/README.md
index cd30aa4b28bbb3f3fabbdf6bebcbbc159a39a597..e5d6c06a31a672c42fd9c85a09c5b6780219da9d 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Place your app-specific code in app/ dir, and utility code that you'd like to ex
 * Clone the repo: `git clone https://github.com/artemv/ruby-starter-kit.git my-app`
 
 ## 1 - In your machine
-* Install Ruby 2.5.1 from https://www.ruby-lang.org/en/downloads/ or via RVM (https://rvm.io/)
+* Install Ruby 2.6.3 from https://www.ruby-lang.org/en/downloads/ or via RVM (https://rvm.io/)
 * Install Bundler and dependencies:
 ```
 cd my-app
@@ -24,6 +24,11 @@ gem install bundler
 bundle install
 ```
 
+If `bundle install` fails trying to install `ffi` and you're on MacOS Mojave, try this and repeat:
+```
+LDFLAGS="-L/usr/local/opt/libffi/lib" PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig" gem install ffi -v '1.11.1' --source 'https://rubygems.org/'
+```
+
 Alternatively if you are using Yeoman you can install it using its generator as described [here](https://github.com/artemv/generator-ruby-starter-kit).
 
 ## 2 - Using Docker