diff --git a/lib/cli/scripts/docker.ts b/lib/cli/scripts/docker.ts
index 74771d7a36..d139f69145 100644
--- a/lib/cli/scripts/docker.ts
+++ b/lib/cli/scripts/docker.ts
@@ -50,9 +50,13 @@ function buildImagePerform(args: PublishArgs, tag: string) {
 
     let buildArgs = [];
 
-    args.buildArgs.forEach((envVar) => {
-        buildArgs.push (`--build-arg=${envVar}`);
-    });
+    if (typeof args.buildArgs  === "string") {
+        buildArgs.push(`--build-arg=${args.buildArgs}`);
+    } else {
+        args.buildArgs.forEach((envVar) => {
+            buildArgs.push (`--build-arg=${envVar}`);
+        });
+    }
 
     const response = exec('docker', ['build', `-t=${args.dockerRepo}:${tag}`, ...buildArgs, args.pathProject], {});
     logger.info(response);
diff --git a/scripts/travis/release/release-docker.sh b/scripts/travis/release/release-docker.sh
index e300ff1aba..0d13e508be 100755
--- a/scripts/travis/release/release-docker.sh
+++ b/scripts/travis/release/release-docker.sh
@@ -33,14 +33,14 @@ then
 
         echo "ℹ️ demo-shell: Running the docker with tag" $TAGS
 
-        DOCKER_PROJECT_ARGS="PROJECT_NAME=demo-shell"
+        DOCKER_PROJECT_ARGS=("PROJECT_NAME=demo-shell")
 
         # Publish Image to docker
         ./node_modules/@alfresco/adf-cli/bin/adf-cli docker --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --buildArgs "$DOCKER_PROJECT_ARGS" --dockerTags "$TAGS" --pathProject "$(pwd)"
 
         echo "ℹ️ storybook-shell: Running the docker with tag" $TAGS
 
-        DOCKER_PROJECT_ARGS="PROJECT_NAME=storybook/process-services-cloud"
+        DOCKER_PROJECT_ARGS=("PROJECT_NAME=storybook/process-services-cloud")
 
         # Publish Image to docker
         ./node_modules/@alfresco/adf-cli/bin/adf-cli docker --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY_STORYBOOK" --buildArgs "$DOCKER_PROJECT_ARGS" --dockerTags "$TAGS" --pathProject "$(pwd)"