diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index e74b93616f01730184346f4b74623807063d8d02..5336a353e4a30f7c25dd281527286e112e4f361e 100644
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:14.16-alpine3.12 as base
 ARG WS_VERSION=unknown-version
 ENV WS_VERSION=${WS_VERSION}
+
 RUN apk update && apk add --virtual build-dependencies \
     git \
     python2 \
diff --git a/ci/build.template.yml b/ci/build.template.yml
index bd9ce075e03320f98981653b03102f17d5bd41c9..075c3b05d97057e55472bcebd573188a9eef039c 100644
--- a/ci/build.template.yml
+++ b/ci/build.template.yml
@@ -4,7 +4,7 @@
         - echo "Building branch or tag -- ${IMAGE_TAG}"
         - NAME="${REGISTRY_URL}/workspaces/${SERVICE_NAME}"
         - docker build -t ${NAME}:${IMAGE_TAG} -f ${PATH_PREFIX}${SERVICE_NAME}/Dockerfile . --build-arg DEPLOY_ENV=${DEPLOY_ENV} --build-arg WS_VERSION=${VERSION}
-             --build-arg CAPO_PROFILE=dsoc-${DEPLOY_ENV} --build-arg API_TOKEN=${API_TOKEN} --target prod
+             --build-arg CAPO_PROFILE=dsoc-${DEPLOY_ENV} --build-arg API_TOKEN=${API_TOKEN} --build-arg BASE_REGISTRY_URL=${REGISTRY_URL} --target prod
         - echo "TAG=${IMAGE_TAG}" >> build.env
     artifacts:
         reports:
diff --git a/services/capability/Dockerfile b/services/capability/Dockerfile
index 01e066d30074b1a46762633c9b8b0e06fd799025..b9dc394c2acec9c4b55132b96d4260c1c4ea73a6 100644
--- a/services/capability/Dockerfile
+++ b/services/capability/Dockerfile
@@ -33,6 +33,7 @@ COPY --chown=vlapipe:vlapipe docker.properties docker.properties
 
 USER root
 WORKDIR /code
+
 RUN apt update -y && apt install -y curl nano
 RUN chown vlapipe . && chgrp vlapipe .
 
diff --git a/services/notification/Dockerfile b/services/notification/Dockerfile
index 5509e01777abbb7143ab8c78019373280ecce178..cc775f8ea25e82894ae5668ff404fa6cd9d2da50 100644
--- a/services/notification/Dockerfile
+++ b/services/notification/Dockerfile
@@ -31,6 +31,7 @@ RUN addgroup --gid 9233 almapipe && \
 
 USER root
 WORKDIR /code/
+
 RUN chown vlapipe . && chgrp vlapipe .
 RUN apt update -y && apt install -y curl -y nano
 
diff --git a/services/workflow/Dockerfile b/services/workflow/Dockerfile
index 8f60f8dfb20dba515b7572bafc66ad9142b2a577..61aa56e87e501182a247567b0d4df09f0d5554e7 100644
--- a/services/workflow/Dockerfile
+++ b/services/workflow/Dockerfile
@@ -2,10 +2,13 @@
 ARG LOCAL_OR_SERVER_PEX=local-pex
 FROM python:3.10-slim-buster as base
 ARG WS_VERSION=unknown-version
+
 ARG DEPLOY_ENV
 ENV DEPLOY_ENV=${DEPLOY_ENV}
+
 ARG ENV_HOST
 ENV ENV_HOST=${ENV_HOST}
+
 ARG API_TOKEN
 
 # Environment variables