diff --git a/cli-linux/build-bits-linux.sh b/cli-linux/build-bits-linux.sh
index 4421c58bd..cd8c7cc2e 100755
--- a/cli-linux/build-bits-linux.sh
+++ b/cli-linux/build-bits-linux.sh
@@ -3,7 +3,8 @@
 declare -x path=$1
 
 if [ -z "$path" ]; then 
-    $path="$(pwd)/../src"; 
+    $path="$(pwd)/../src";
+    echo -e "\e[33mNo path passed. Will use $path"
 fi
 
 declare -a projectList=(
@@ -30,9 +31,9 @@ do
     echo -e "\e[33m\tRemoving old publish output"
     pushd $path/$project
     rm -rf obj/Docker/publish
-    echo -e "\e[33m\tRestoring project"
+    echo -e "\e[33m\tRestoring project $project"
     dotnet restore
-    echo -e "\e[33m\tBuilding and publishing projects"
+    echo -e "\e[33m\tBuilding and publishing $project"
     dotnet publish -o obj/Docker/publish
     popd
 done
diff --git a/docker-compose-external.yml b/docker-compose-external.yml
index ff1641cdd..8d8d61add 100644
--- a/docker-compose-external.yml
+++ b/docker-compose-external.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 services:
   sql.data:
diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml
index f32f3b239..db2ef5390 100644
--- a/docker-compose.ci.build.yml
+++ b/docker-compose.ci.build.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 services:
   ci-build:
diff --git a/docker-compose.nobuild.yml b/docker-compose.nobuild.yml
index f74aa9c14..0905f9799 100644
--- a/docker-compose.nobuild.yml
+++ b/docker-compose.nobuild.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 services:
   basket.api:
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index f5ad0c9f3..eddfdf7e1 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 # The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine. 
 # The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: 
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index c7c6fc3a8..1fac4f5e6 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 # The Production docker-compose file has to have the external/real IPs or DNS names for the services 
 # The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: 
diff --git a/docker-compose.vs.debug.yml b/docker-compose.vs.debug.yml
index b0c792d32..9c4879f61 100644
--- a/docker-compose.vs.debug.yml
+++ b/docker-compose.vs.debug.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 services:
   basket.api:
diff --git a/docker-compose.vs.release.yml b/docker-compose.vs.release.yml
index 6aac3f799..92be2557b 100644
--- a/docker-compose.vs.release.yml
+++ b/docker-compose.vs.release.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 services:
   basket.api:
diff --git a/docker-compose.yml b/docker-compose.yml
index 66b8ba49e..699415dff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '2.1'
 
 services:
   graceperiodmanager: