diff --git a/src/docker-compose-tests.yml b/src/docker-compose-tests.yml
index 82fee17db..95913cfee 100644
--- a/src/docker-compose-tests.yml
+++ b/src/docker-compose-tests.yml
@@ -2,7 +2,7 @@ version: '3.4'
 
 services:
   sql-data-test:
-    image: mcr.microsoft.com/mssql/server:2019-latest 
+    image: mcr.microsoft.com/azure-sql-edge:latest
 
   nosql-data-test:
     image: mongo
diff --git a/src/docker-compose.windows.yml b/src/docker-compose.windows.yml
index 11ecfa3cd..ef3210394 100644
--- a/src/docker-compose.windows.yml
+++ b/src/docker-compose.windows.yml
@@ -6,7 +6,7 @@ version: '3.4'
 
 services:
   sqldata:
-    image: mcr.microsoft.com/mssql/server:2019-latest 
+    image: mcr.microsoft.com/azure-sql-edge:latest
 
   nosqldata:
     image: mongo:windowsservercore
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 3ae5d431a..ea9985ab1 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -6,8 +6,8 @@ services:
     image: datalust/seq:latest
 
   sqldata:
-    image: mcr.microsoft.com/mssql/server:2019-latest 
-
+    image: mcr.microsoft.com/azure-sql-edge:latest
+  
   nosqldata:
     image: mongo
 
@@ -79,7 +79,7 @@ services:
       - sqldata
 
   mobileshoppingapigw:
-    image: envoyproxy/envoy:v1.11.1
+    image: envoyproxy/envoy:v1.16.0
 
   mobileshoppingagg:
     image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
@@ -158,4 +158,4 @@ services:
       - webhooks-api
 
   webshoppingapigw:
-    image: envoyproxy/envoy:v1.11.1
+    image: envoyproxy/envoy:v1.16.0