diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml
index 652e30383..b71459931 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml
@@ -20,7 +20,7 @@
     </EntryPoint>
     <!-- Pass environment variables to your container: -->
     <EnvironmentVariables>
-      <EnvironmentVariable Name="SA_PASSWORD" Value="Pass@word"/>
+      <EnvironmentVariable Name="MSSQL_SA_PASSWORD" Value="Pass@word"/>
       <EnvironmentVariable Name="ACCEPT_EULA" Value="Y"/>
     </EnvironmentVariables>
   </CodePackage>
diff --git a/docker-compose-external.override.yml b/docker-compose-external.override.yml
index f20440ad7..60764ca54 100644
--- a/docker-compose-external.override.yml
+++ b/docker-compose-external.override.yml
@@ -3,7 +3,7 @@ version: '2'
 services:
   sql.data:
     environment:
-      - SA_PASSWORD=Pass@word
+      - MSSQL_SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
     ports:
       - "5433:1433"
\ No newline at end of file
diff --git a/docker-compose-external.yml b/docker-compose-external.yml
index 8d8d61add..50bbd12af 100644
--- a/docker-compose-external.yml
+++ b/docker-compose-external.yml
@@ -2,7 +2,7 @@ version: '2.1'
 
 services:
   sql.data:
-    image: microsoft/mssql-server-linux
+    image: microsoft/mssql-server-linux:2017-latest
 
   basket.data:
     image: redis
diff --git a/docker-compose-windows.prod.yml b/docker-compose-windows.prod.yml
index d5ea2d1bc..25b78a7a8 100644
--- a/docker-compose-windows.prod.yml
+++ b/docker-compose-windows.prod.yml
@@ -121,7 +121,7 @@ services:
 
   sql.data:
     environment:
-      - SA_PASSWORD=Pass@word
+      - MSSQL_SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
     ports:
       - "5433:1433"
diff --git a/docker-compose.nobuild.yml b/docker-compose.nobuild.yml
index 186ab8639..5c6c691e6 100644
--- a/docker-compose.nobuild.yml
+++ b/docker-compose.nobuild.yml
@@ -66,7 +66,7 @@ services:
       - rabbitmq
 
   sql.data:
-    image: microsoft/mssql-server-linux
+    image: microsoft/mssql-server-linux:2017-latest
   
   nosql.data:
     image: mongo
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index bb5cc732f..0d4c420c2 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -177,7 +177,7 @@ services:
 
   sql.data:
     environment:
-      - SA_PASSWORD=Pass@word
+      - MSSQL_SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
       - MSSQL_PID=Developer
     ports:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 313811f19..b3d3f1156 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -124,7 +124,7 @@ services:
 
   sql.data:
     environment:
-      - SA_PASSWORD=Pass@word
+      - MSSQL_SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
       - MSSQL_PID=Developer
     ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index 23acd8af7..e6d9385a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -97,7 +97,7 @@ services:
       - rabbitmq
 
   sql.data:
-    image: microsoft/mssql-server-linux:latest
+    image: microsoft/mssql-server-linux:2017-latest
 
   nosql.data:
     image: mongo
diff --git a/k8s/sql-data.yaml b/k8s/sql-data.yaml
index 4b607ac98..245622e83 100644
--- a/k8s/sql-data.yaml
+++ b/k8s/sql-data.yaml
@@ -25,11 +25,11 @@ spec:
     spec:
       containers:
       - name: sql-data
-        image: microsoft/mssql-server-linux:latest
+        image: microsoft/mssql-server-linux:2017-latest
         env:
         - name: ACCEPT_EULA
           value: "Y"
         - name: MSSQL_PID
           value: Developer
-        - name: SA_PASSWORD
+        - name: MSSQL_SA_PASSWORD
           value: Pass@word
diff --git a/src/Web/WebMonolithic/docker-compose.override.yml b/src/Web/WebMonolithic/docker-compose.override.yml
index e908c1de9..436429c19 100644
--- a/src/Web/WebMonolithic/docker-compose.override.yml
+++ b/src/Web/WebMonolithic/docker-compose.override.yml
@@ -11,7 +11,7 @@ services:
 
   sql.data:
     environment:
-      - SA_PASSWORD=Pass@word
+      - MSSQL_SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
     ports:
       - "5433:1433"
diff --git a/src/Web/WebMonolithic/docker-compose.yml b/src/Web/WebMonolithic/docker-compose.yml
index dceec42c5..7ca7e96b5 100644
--- a/src/Web/WebMonolithic/docker-compose.yml
+++ b/src/Web/WebMonolithic/docker-compose.yml
@@ -9,4 +9,4 @@ services:
     depends_on:
       - sql.data
   sql.data:
-    image: microsoft/mssql-server-linux
+    image: microsoft/mssql-server-linux:2017-latest