diff --git a/Dockerfile b/Dockerfile
index 317e6fa..80362f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM ruby:2.3
+FROM ruby:2.4
 
-MAINTAINER  Alexandre Buisine <alexandrejabuisine@gmail.com>
-LABEL version="2.2.0"
+LABEL maintainer="Alexandre Buisine <alexandrejabuisine@gmail.com>"
+LABEL version="2.4.0"
 
 ENV BASE_URL="/resque_web"
 
@@ -16,7 +16,7 @@ RUN gem install rails --no-ri --no-rdoc \
  && cd / \
  && rails new resque-scheduler-web \
  && cd resque-scheduler-web \
- && echo "gem 'sinatra', '2.0.0.beta2'" >> Gemfile \
+ && echo "gem 'sinatra'" >> Gemfile \
  && echo "gem 'resque'" >> Gemfile \
  && echo "gem 'resque-scheduler'" >> Gemfile \
  && echo "gem 'resque-web', require: 'resque_web'" >> Gemfile \
diff --git a/README.md b/README.md
index 3016215..3b2cf87 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This container is compatible with `resque-scheduler`.
 The container is based on `ruby:2.3` and sinatra 2.
 
 ## DISCLAIMER
-Uses Sinatra `2.0.0.beta2`.
+Uses Sinatra `2.0.0`.
 Available versions of this container are quite big (to be solved in next versions).
 
 ## NOTICE
@@ -16,16 +16,13 @@ Note that the sinatra web interface will be gone in Resque 2.0 and this is meant
 Resque (pronounced like "rescue") is a Redis-backed library for creating background jobs, placing those jobs on multiple queues, and processing them later.
 
 ## About Resque-Web
-A Rails-based frontend to the [Resque](https://github.com/resque/resque) job
-queue system. This provides a similar interface to the existing Sinatra
-application that comes bundled with Resque, but deploys like a Rails application
-and leverages Rails conventions for factoring things like controllers, helpers,
-and views.
+A Rails-based frontend to the [Resque](https://github.com/resque/resque) job queue system.
+This provides a similar interface to the existing Sinatra application that comes bundled with Resque, but deploys like a Rails application and leverages Rails conventions for factoring things like controllers, helpers, and views.
 
 ## About Resque-Scheduler-Web
 Provides tabs in Resque Web for managing Resque Scheduler.
 It works with any version of Resque and Resque Scheduler.
-This gem is a port of the old Sinatra code to the new REsque Web plugin architecture and has better test coverage and a number of bug fixes compared to the older Resque Scheduler Sinatra code which it is based on.
+This gem is a port of the old Sinatra code to the new Resque Web plugin architecture and has better test coverage and a number of bug fixes compared to the older Resque Scheduler Sinatra code which it is based on.
 
 # Configuration
 
@@ -35,4 +32,4 @@ If you need a non-default resque server, use this environment variable:
 RAILS_RESQUE_REDIS=<host>:<port>:<database>
 ```
 
-This container is configured to serve Resque-Web on the `/resque-web` path which allows simple reverse proxy configuration.
\ No newline at end of file
+This container is configured to serve Resque-Web on the `/resque_web` path which allows simple reverse proxy configuration.
\ No newline at end of file
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index 9c243b3..1450075 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -6,7 +6,7 @@ services:
   restart: always
 
  resque-web:
-  image: abuisine/resque-web:2.2.0
+  image: abuisine/resque-web:2.4.0
   depends_on:
    - redis
   ports: