diff --git a/scripts/bash/tcb-env-setup.sh b/scripts/bash/tcb-env-setup.sh
index d59cf40cf..704295828 100755
--- a/scripts/bash/tcb-env-setup.sh
+++ b/scripts/bash/tcb-env-setup.sh
@@ -6,7 +6,7 @@ shopt -s expand_aliases
 # For DockerHub the variable can be empty, by tcb platform push command
 # requires a value, so passing the default DockerHub registry to it if it is
 # empty
-if [$DOCKER_REGISTRY = ""]; then
+if [ $DOCKER_REGISTRY = "" ]; then
     export DOCKER_REGISTRY="registry-1.docker.io"
 fi
 
diff --git a/scripts/createDockerComposeProduction.ps1 b/scripts/createDockerComposeProduction.ps1
index 31bce25e8..44110e1b7 100644
--- a/scripts/createDockerComposeProduction.ps1
+++ b/scripts/createDockerComposeProduction.ps1
@@ -145,7 +145,7 @@ $localRegistry = $objSettings.host_ip
 
 $env:LOCAL_REGISTRY="$($localRegistry):5002"
 $env:TAG="$tag"
-if ([string]::IsNullOrEmpty($registry)) {
+if ([string]::IsNullOrEmpty($registry) -or $registry -eq "registry-1.docker.io") {
     $env:DOCKER_LOGIN="$dockerLogin"
 } else {
     $env:DOCKER_LOGIN="$registry/$dockerLogin"