diff --git a/.docker/release-candidate/Dockerfile b/.docker/release-candidate/Dockerfile
new file mode 100644
index 000000000000..4da2dc936f6d
--- /dev/null
+++ b/.docker/release-candidate/Dockerfile
@@ -0,0 +1,35 @@
+FROM rocketchat/base:4
+
+ENV RC_VERSION release-candidate
+
+MAINTAINER buildmaster@rocket.chat
+
+RUN set -x \
+ && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
+ && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
+ && mkdir /app \
+ && gpg --verify rocket.chat.tgz.asc \
+ && mkdir -p /app \
+ && tar -zxf rocket.chat.tgz -C /app \
+ && rm rocket.chat.tgz rocket.chat.tgz.asc \
+ && cd /app/bundle/programs/server \
+ && npm install \
+ && npm cache clear \
+ && chown -R rocketchat:rocketchat /app
+
+USER rocketchat
+
+VOLUME /app/uploads
+
+WORKDIR /app/bundle
+
+# needs a mongoinstance - defaults to container linking with alias 'mongo'
+ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
+    HOME=/tmp \
+    PORT=3000 \
+    ROOT_URL=http://localhost:3000 \
+    Accounts_AvatarStorePath=/app/uploads
+
+EXPOSE 3000
+
+CMD ["node", "main.js"]
diff --git a/.travis.yml b/.travis.yml
index 44618140f36a..9fed9bbe3480 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ services:
 branches:
   only:
   - develop
-  - experimental
-  - "/^(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)$/"
+  - release-candidate
+  - "/^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$/"
 git:
   depth: 1
 node_js:
@@ -86,7 +86,7 @@ deploy:
 after_deploy:
 - ".travis/docker.sh"
 - ".travis/update-releases.sh"
-- ".travis/snap.sh"
+#- ".travis/snap.sh"
 env:
   global:
   - DISPLAY=:99.0