diff --git a/oem/azure/common.sh b/oem/azure/common.sh
index 08e040629f..666e30248e 100644
--- a/oem/azure/common.sh
+++ b/oem/azure/common.sh
@@ -9,12 +9,13 @@ getManagementEndpoint() {
 }
 
 getStorageEndpointPrefix() {
-	azure account env show --environment=$(getAzureEnvironment) --json | \
-		jq '.storageEndpointSuffix' --raw-output
+	prefix=$(azure account env show --environment=$(getAzureEnvironment) --json | \
+		jq '.storageEndpointSuffix' --raw-output)
+	echo "${prefix##.}"
 }
 
 getBlobStorageEndpoint() {
-	echo "blob$(getStorageEndpointPrefix)"
+	echo "blob.$(getStorageEndpointPrefix)"
 }
 
 getSubscriptionId() {
diff --git a/oem/azure/replicate-image.sh b/oem/azure/replicate-image.sh
index b47de4634b..0e7c2a851f 100755
--- a/oem/azure/replicate-image.sh
+++ b/oem/azure/replicate-image.sh
@@ -25,6 +25,7 @@ if [ -z $subscription_id ]; then
 	subscription_id=$(getSubscriptionId)
 fi
 
+IFS=$'\n'
 requestBody="<ReplicationInput xmlns=\"http://schemas.microsoft.com/windowsazure\">
 	<TargetLocations>"
 for region in $(getRegions); do
@@ -38,6 +39,7 @@ requestBody+="
 		<Version>${VERSION}</Version>
 	</ComputeImageAttributes>
 </ReplicationInput>"
+unset IFS
 
 url="$(getManagementEndpoint)/${subscription_id}/services/images/${image_name}/replicate"