diff --git a/docker-compose.yml b/docker-compose.yml
index 3b53e54d..a7478e53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -424,6 +424,7 @@ services:
       build:
         context: ./mssql
       environment:
+        - MSSQL_PID=Express
         - MSSQL_DATABASE=${MSSQL_DATABASE}
         - SA_PASSWORD=${MSSQL_PASSWORD}
         - ACCEPT_EULA=Y
diff --git a/env-example b/env-example
index d335d9bf..7d63259d 100644
--- a/env-example
+++ b/env-example
@@ -294,7 +294,7 @@ PERCONA_ENTRYPOINT_INITDB=./percona/docker-entrypoint-initdb.d
 
 ### MSSQL #################################################
 
-MSSQL_DATABASE=homestead
+MSSQL_DATABASE=master
 MSSQL_PASSWORD=yourStrong(!)Password
 MSSQL_PORT=1433
 
diff --git a/mssql/Dockerfile b/mssql/Dockerfile
index 2d9e5ac9..c777500e 100644
--- a/mssql/Dockerfile
+++ b/mssql/Dockerfile
@@ -1,17 +1,6 @@
-FROM microsoft/mssql-server-linux
-
-LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
-
-# Create config directory
-# an set it as WORKDIR
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-
-# Bundle app source
-COPY . /usr/src/app
-
-RUN chmod +x /usr/src/app/create_table.sh
+FROM mcr.microsoft.com/mssql/server:2017-latest-ubuntu
 
+ENV MSSQL_PID=Express
 ENV MSSQL_DATABASE=$MSSQL_DATABASE
 ENV ACCEPT_EULA=Y
 ENV SA_PASSWORD=$MSSQL_PASSWORD
@@ -19,5 +8,3 @@ ENV SA_PASSWORD=$MSSQL_PASSWORD
 VOLUME /var/opt/mssql
 
 EXPOSE 1433
-
-CMD /bin/bash ./entrypoint.sh
diff --git a/mssql/create_table.sh b/mssql/create_table.sh
deleted file mode 100644
index 9fe5214c..00000000
--- a/mssql/create_table.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#wait for the SQL Server to come up
-sleep 45
-
-#run the setup script to create the DB and the schema in the DB
-/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -d master -i setup.sql
\ No newline at end of file
diff --git a/mssql/entrypoint.sh b/mssql/entrypoint.sh
deleted file mode 100644
index 062293b8..00000000
--- a/mssql/entrypoint.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#start SQL Server, start the script to create the DB and import the data, start the app
-/opt/mssql/bin/sqlservr & /usr/src/app/create_table.sh & tail -f /dev/null
diff --git a/mssql/setup.sql b/mssql/setup.sql
deleted file mode 100644
index f453c778..00000000
--- a/mssql/setup.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE DATABASE $(MSSQL_DATABASE);
-GO
-USE $(MSSQL_DATABASE);
-GO
\ No newline at end of file