diff --git a/oem/azure/common.sh b/oem/azure/common.sh
index 5cbb513a73..a0cb3f80f9 100644
--- a/oem/azure/common.sh
+++ b/oem/azure/common.sh
@@ -1,4 +1,3 @@
-AZURE_ENVIRONMENT=AzureCloud
 REGIONS=(
 	"West Europe"
 	"North Europe"
@@ -24,11 +23,25 @@ REGIONS=(
 	"UK South 2"
 )
 
+getAzureEnvironment() {
+	azure account show --json | \
+		jq '.[0].environmentName' --raw-output
+}
+
 getManagementEndpoint() {
-	azure account env show --environment=$AZURE_ENVIRONMENT --json | \
+	azure account env show --environment=$(getAzureEnvironment) --json | \
 		jq '.managementEndpointUrl' --raw-output
 }
 
+getStorageEndpointPrefix() {
+	azure account env show --environment=$(getAzureEnvironment) --json | \
+		jq '.storageEndpointSuffix' --raw-output
+}
+
+getBlobStorageEndpoint() {
+	echo "blob$(getStorageEndpointPrefix)"
+}
+
 getSubscriptionId() {
 	azure account show --json | \
 		jq '.[0].id' --raw-output
diff --git a/oem/azure/publish.sh b/oem/azure/publish.sh
index 43f680f800..b65ff781ef 100755
--- a/oem/azure/publish.sh
+++ b/oem/azure/publish.sh
@@ -61,7 +61,7 @@ azure storage blob copy start \
 
 echo "Creating Azure image from blob..."
 azure vm image create \
-	--blob-url="https://coreos.blob.core.windows.net/publish/coreos-${VERSION}-${LGROUP}.vhd" \
+	--blob-url="https://coreos.$(getBlobStorageEndpoint)/publish/coreos-${VERSION}-${LGROUP}.vhd" \
 	--os="linux" \
 	--label="CoreOS ${UGROUP}" \
 	"CoreOS-${UGROUP}-${VERSION}"