diff --git a/devenv/docker/blocks/mssql/build/Dockerfile b/devenv/docker/blocks/mssql/build/Dockerfile
index 620f0ca4013..ade5714a709 100644
--- a/devenv/docker/blocks/mssql/build/Dockerfile
+++ b/devenv/docker/blocks/mssql/build/Dockerfile
@@ -1,5 +1,12 @@
-FROM mcr.microsoft.com/mssql/server:2017-CU4-ubuntu
+FROM mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-18.04
 WORKDIR /usr/setup
-COPY . /usr/setup
-RUN chmod +x /usr/setup/setup.sh
-CMD /bin/bash ./entrypoint.sh
\ No newline at end of file
+COPY setup.sh setup.sql.template entrypoint.sh ./
+
+USER root
+
+RUN chmod +x setup.sh
+RUN chown -R mssql ./
+
+USER mssql
+
+CMD /bin/bash ./entrypoint.sh
diff --git a/devenv/docker/blocks/mssql/build/setup.sh b/devenv/docker/blocks/mssql/build/setup.sh
index e1d509b042e..5d22062bd2f 100755
--- a/devenv/docker/blocks/mssql/build/setup.sh
+++ b/devenv/docker/blocks/mssql/build/setup.sh
@@ -1,4 +1,5 @@
 #/bin/bash
+set -eo pipefail
 
 #wait for the SQL Server to come up
 sleep 15s
@@ -9,4 +10,4 @@ cat /usr/setup/setup.sql.template | awk '{
   gsub(/%%PWD%%/,"'$MSSQL_PASSWORD'")
 }1' > /usr/setup/setup.sql
 
-/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -d master -i /usr/setup/setup.sql
\ No newline at end of file
+/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -d master -i /usr/setup/setup.sql