diff --git a/infra/scripts/docker-build.ps1 b/infra/scripts/docker-build.ps1
index 10b5632a..8a0816d3 100644
--- a/infra/scripts/docker-build.ps1
+++ b/infra/scripts/docker-build.ps1
@@ -11,6 +11,10 @@ param (
 # Convert USE_LOCAL_BUILD to Boolean
 $USE_LOCAL_BUILD = if ($USE_LOCAL_BUILD -match "^(?i:true)$") { $true } else { $false }
 
+if ([string]::IsNullOrEmpty($AZURE_ENV_IMAGETAG)) {
+    $AZURE_ENV_IMAGETAG = "latest"
+}
+
 # Validate required parameters
 if (-not $AZURE_SUBSCRIPTION_ID -or -not $ENV_NAME -or -not $AZURE_LOCATION -or -not $AZURE_RESOURCE_GROUP) {
     Write-Error "Missing required arguments. Usage: docker-build.ps1 <AZURE_SUBSCRIPTION_ID> <ENV_NAME> <AZURE_LOCATION> <AZURE_RESOURCE_GROUP> <USE_LOCAL_BUILD> <AZURE_ENV_IMAGETAG>"
diff --git a/infra/scripts/docker-build.sh b/infra/scripts/docker-build.sh
index d1833938..9621e32f 100644
--- a/infra/scripts/docker-build.sh
+++ b/infra/scripts/docker-build.sh
@@ -24,6 +24,8 @@ AZURE_ENV_IMAGETAG=$6
 
 USE_LOCAL_BUILD=$(echo "$USE_LOCAL_BUILD" | grep -iq "^true$" && echo "true" || echo "false")
 
+AZURE_ENV_IMAGETAG=${AZURE_ENV_IMAGETAG:-latest}
+
 if [ "$USE_LOCAL_BUILD" = "true" ]; then
     echo "Local Build enabled. Starting build process."
     az account set --subscription "$AZURE_SUBSCRIPTION_ID"