diff --git a/.ci/build-images.sh b/.ci/build-images.sh
index 22bb847c..80972f64 100755
--- a/.ci/build-images.sh
+++ b/.ci/build-images.sh
@@ -52,7 +52,7 @@ function _build
     echo "building ${_PATH}: ${IMAGE_NAME} (from: ${DOCKER_BASE})"
 
     # to speed up builds
-    docker pull "${IMAGE_NAME}"
+    docker pull "${IMAGE_NAME}" || true
 
     #shellcheck disable=SC2086
     docker-compose -f "${_PATH}" \
@@ -127,13 +127,15 @@ function _main
         LXGW_SERVICES_HASH="$(git log -n1 --pretty=%h)"
         LXGW_C_MESH_API_HASH="$(git -C ${REPO_EDGE}/sink_service/c-mesh-api log -n1 --pretty=%h)"
 
-        # we want to copy the current changes (not what is in cr)
-        cp -vr "${GIT_REPO_FOLDER}/sink_service/c-mesh-api" "sink_service"
+        # The edge builds relies on the current gateway branch.
+        # The c-mesh-api must be pulled into the root level so that
+        # it is taken in use by the current build.
+        # If you would use the source from REPO_EDGE, you end up building
+        # the previous commit merged in master.
+        cp -vr "${REPO_EDGE}/sink_service/c-mesh-api" "sink_service"
         _build "${DOCKERFILE_PATH}/dev/docker-compose.yml" "arm"
         _build "${DOCKERFILE_PATH}/dev/docker-compose.yml" "x86"
     fi
-
-
 }
 
 
diff --git a/.dockerignore b/.dockerignore
index e9511123..9c24e877 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,7 +10,6 @@
 
 
 *.idea/*
-*.ci/*
 img/*
 
 .clang-format
@@ -34,5 +33,4 @@ python_transport/dist/*
 python_transport/docs/source/api/*
 python_transport/docs/build/*
 
-
 container/common/wm_transport_service.yml
diff --git a/container/stable/arm/docker-compose.yml b/container/stable/arm/docker-compose.yml
index a704f6b4..9de49d07 100644
--- a/container/stable/arm/docker-compose.yml
+++ b/container/stable/arm/docker-compose.yml
@@ -17,7 +17,7 @@ services:
                 VERSION: ${VERSION:-"1.2.0-rc.1"}
                 BUILD_DATE: ${BUILD_DATE:-"undefined"}
                 DOCKER_BASE: balenalib/raspberrypi3
-                SOURCE_PATH: .ci/repo_stable
+                SOURCE_PATH: .ci/_repo_stable
                 CROSS_BUILD_START_CMD: cross-build-start
                 CROSS_BUILD_END_CMD: cross-build-end
                 GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway/stable.xml}
diff --git a/container/stable/x86/docker-compose.yml b/container/stable/x86/docker-compose.yml
index ce0cb70b..446f476d 100644
--- a/container/stable/x86/docker-compose.yml
+++ b/container/stable/x86/docker-compose.yml
@@ -17,7 +17,7 @@ services:
                 VERSION: ${VERSION:-"1.2.0-rc.1"}
                 BUILD_DATE: ${BUILD_DATE:-"undefined"}
                 DOCKER_BASE: ubuntu:19.04
-                SOURCE_PATH: .ci/repo_stable
+                SOURCE_PATH: .ci/_repo_stable
                 CROSS_BUILD_START_CMD: ":"
                 CROSS_BUILD_END_CMD: ":"
                 GIT_MANIFEST_FILE: ${GIT_MANIFEST_FILE:-gateway/stable.xml}