diff --git a/docker/1.4/Dockerrun.aws.zip b/docker/1.4/Dockerrun.aws.zip
deleted file mode 100644
index 55bc98eea2..0000000000
Binary files a/docker/1.4/Dockerrun.aws.zip and /dev/null differ
diff --git a/docker/1.4/Dockerfile b/docker/2.1/Dockerfile
similarity index 84%
rename from docker/1.4/Dockerfile
rename to docker/2.1/Dockerfile
index 8dcea3927a..71dcd602a3 100644
--- a/docker/1.4/Dockerfile
+++ b/docker/2.1/Dockerfile
@@ -34,8 +34,8 @@ VOLUME /var/lib/mysql
 WORKDIR /mattermost
 
 # Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v1.4.0/mattermost.tar.gz /
-RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
+ADD https://releases.mattermost.com/mattermost-team-2.1.0-rc1-linux-amd64.tar.gz
+RUN tar -zxvf /mattermost-team-2.1.0-rc1-linux-amd64.tar.gz --strip-components=1 && rm /mattermost-team-2.1.0-rc1-linux-amd64.tar.gz
 ADD config_docker.json /
 ADD docker-entry.sh /
 
diff --git a/docker/2.1/Dockerrun.aws.zip b/docker/2.1/Dockerrun.aws.zip
new file mode 100644
index 0000000000..19bbc74032
Binary files /dev/null and b/docker/2.1/Dockerrun.aws.zip differ
diff --git a/docker/1.4/Dockerrun.aws/.ebextensions/01_files.config b/docker/2.1/Dockerrun.aws/.ebextensions/01_files.config
similarity index 100%
rename from docker/1.4/Dockerrun.aws/.ebextensions/01_files.config
rename to docker/2.1/Dockerrun.aws/.ebextensions/01_files.config
diff --git a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json b/docker/2.1/Dockerrun.aws/Dockerrun.aws.json
similarity index 75%
rename from docker/1.4/Dockerrun.aws/Dockerrun.aws.json
rename to docker/2.1/Dockerrun.aws/Dockerrun.aws.json
index 6549615894..a52309aad4 100755
--- a/docker/1.4/Dockerrun.aws/Dockerrun.aws.json
+++ b/docker/2.1/Dockerrun.aws/Dockerrun.aws.json
@@ -1,7 +1,7 @@
 {
   "AWSEBDockerrunVersion": "1",
   "Image": {
-    "Name": "mattermost/platform:1.4",
+    "Name": "mattermost/platform:2.1",
     "Update": "true"
   },
   "Ports": [
diff --git a/docker/1.4/README.md b/docker/2.1/README.md
similarity index 100%
rename from docker/1.4/README.md
rename to docker/2.1/README.md
diff --git a/docker/1.4/config_docker.json b/docker/2.1/config_docker.json
similarity index 94%
rename from docker/1.4/config_docker.json
rename to docker/2.1/config_docker.json
index 1aa2ee843f..6a12901893 100644
--- a/docker/1.4/config_docker.json
+++ b/docker/2.1/config_docker.json
@@ -7,11 +7,14 @@
         "EnableOAuthServiceProvider": false,
         "EnableIncomingWebhooks": false,
         "EnableOutgoingWebhooks": false,
+        "EnableCommands": false,
+        "EnableOnlyAdminIntegrations": true,
         "EnablePostUsernameOverride": false,
         "EnablePostIconOverride": false,
         "EnableTesting": false,
         "EnableDeveloper": false,
         "EnableSecurityFixAlert": true,
+        "EnableInsecureOutgoingConnections": false,
         "SessionLengthWebInDays" : 30,
         "SessionLengthMobileInDays" : 30,
         "SessionLengthSSOInDays" : 30,
@@ -66,6 +69,8 @@
     },
     "EmailSettings": {
         "EnableSignUpWithEmail": true,
+        "EnableSignInWithEmail": true,
+        "EnableSignInWithUsername": false,
         "SendEmailNotifications": false,
         "RequireEmailVerification": false,
         "FeedbackName": "",
diff --git a/docker/1.4/docker-entry.sh b/docker/2.1/docker-entry.sh
similarity index 100%
rename from docker/1.4/docker-entry.sh
rename to docker/2.1/docker-entry.sh