diff --git a/tag.sh b/tag.sh
index 8ee66014..e3fee315 100755
--- a/tag.sh
+++ b/tag.sh
@@ -13,8 +13,8 @@ for dir in ${VERSIONS}; do
   [ ! -e "${dir}/.image-id" ] && echo "-> Image for version $dir not built, skipping tag." && continue
   pushd ${dir} > /dev/null
   IMAGE_ID=$(cat .image-id)
-  name=$(docker inspect -f "{{.ContainerConfig.Labels.name}}" $IMAGE_ID)
-  version=$(docker inspect -f "{{.ContainerConfig.Labels.version}}" $IMAGE_ID)
+  name=$(docker inspect -f "{{.Config.Labels.name}}" $IMAGE_ID)
+  version=$(docker inspect -f "{{.Config.Labels.version}}" $IMAGE_ID)
 
   echo "-> Tagging image '$IMAGE_ID' as '$name:$version' and '$name:latest'"
   docker tag $IMAGE_ID "$name:$version"
diff --git a/test-lib.sh b/test-lib.sh
index 7604369b..cdd0f77c 100644
--- a/test-lib.sh
+++ b/test-lib.sh
@@ -462,7 +462,7 @@ ct_s2i_build_as_df()
     pushd "$tmpdir"
     # Check if the image is available locally and try to pull it if it is not
     docker images "$src_image" &>/dev/null || echo "$s2i_args" | grep -q "pull-policy=never" || docker pull "$src_image"
-    user_id=$(docker inspect -f "{{.ContainerConfig.User}}" "$src_image")
+    user_id=$(docker inspect -f "{{.Config.User}}" "$src_image")
     # Strip file:// from APP_PATH and copy its contents into current context
     mkdir -p "$local_app"
     cp -r "${app_path/file:\/\//}/." "$local_app"
diff --git a/test.sh b/test.sh
index c0c95128..f7285d55 100755
--- a/test.sh
+++ b/test.sh
@@ -13,7 +13,7 @@ for dir in ${VERSIONS}; do
   pushd ${dir} > /dev/null
   export IMAGE_ID=$(cat .image-id)
   # Kept also IMAGE_NAME as some tests might still use that.
-  export IMAGE_NAME=$(docker inspect -f "{{.ContainerConfig.Labels.name}}" $IMAGE_ID)
+  export IMAGE_NAME=$(docker inspect -f "{{.Config.Labels.name}}" $IMAGE_ID)
 
   if [ -n "${TEST_MODE}" ]; then
     VERSION=$dir test/run