diff --git a/src/publish.proj b/src/publish.proj
index 37d9d277cc65..14158259d12f 100644
--- a/src/publish.proj
+++ b/src/publish.proj
@@ -38,12 +38,6 @@
       </ItemsToPush>
     </ItemGroup>
 
-    <!-- create the container if it doesn't exist -->
-    <CreateAzureContainer AccountKey="$(AccountKey)"
-                          AccountName="$(AccountName)"
-                          ContainerName="$(ContainerName)"
-                          IsPublic="true" />
-
     <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'"
                     ExpectedFeedUrl="$(ExpectedFeedUrl)"
                     AccountKey="$(AccountKey)"
@@ -54,6 +48,13 @@
                     ManifestBranch="$(ManifestBranch)"
                     ManifestCommit="$(ManifestCommit)" />
 
+    <!-- create the container if it doesn't exist -->
+    <CreateAzureContainer Condition="'$(PublishFlatContainer)' == 'true'"
+                          AccountKey="$(AccountKey)"
+                          AccountName="$(AccountName)"
+                          ContainerName="$(ContainerName)"
+                          IsPublic="true" />
+
     <!-- now upload the items -->
     <UploadToAzure  Condition="'$(PublishFlatContainer)' == 'true'"
                     AccountKey="$(AccountKey)"
@@ -75,12 +76,6 @@
       </ItemsToPush>
     </ItemGroup>
 
-   <!-- create the container if it doesn't exist -->
-    <CreateAzureContainer AccountKey="$(AccountKey)"
-                          AccountName="$(AccountName)"
-                          ContainerName="$(ContainerName)"
-                          IsPublic="true" />
-
     <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'"
                     ExpectedFeedUrl="$(ExpectedFeedUrl)"
                     AccountKey="$(AccountKey)"
@@ -91,6 +86,13 @@
                     ManifestBranch="$(ManifestBranch)"
                     ManifestCommit="$(ManifestCommit)" />
 
+    <!-- create the container if it doesn't exist -->
+    <CreateAzureContainer Condition="'$(PublishFlatContainer)' == 'true'"
+                          AccountKey="$(AccountKey)"
+                          AccountName="$(AccountName)"
+                          ContainerName="$(ContainerName)"
+                          IsPublic="true" />
+
     <!-- now upload the items -->
     <UploadToAzure  Condition="'$(PublishFlatContainer)' == 'true'"
                     AccountKey="$(AccountKey)"
@@ -113,18 +115,19 @@
       </ItemsToPush>
     </ItemGroup>
 
-    <!-- create the container if it doesn't exist -->
-    <CreateAzureContainer AccountKey="$(AccountKey)"
-                          AccountName="$(AccountName)"
-                          ContainerName="$(ContainerName)"
-                          IsPublic="true" />
-
     <PushToBlobFeed Condition="'$(PublishFlatContainer)' == 'false'"
                     ExpectedFeedUrl="$(ExpectedFeedUrl)"
                     AccountKey="$(AccountKey)"
                     ItemsToPush="@(ItemsToPush)"
                     Overwrite="$(OverwriteOnPublish)" />
 
+    <!-- create the container if it doesn't exist -->
+    <CreateAzureContainer Condition="'$(PublishFlatContainer)' == 'true'"
+                          AccountKey="$(AccountKey)"
+                          AccountName="$(AccountName)"
+                          ContainerName="$(ContainerName)"
+                          IsPublic="true" />
+
     <!-- now upload the items -->
     <UploadToAzure  Condition="'$(PublishFlatContainer)' == 'true'"
                     AccountKey="$(AccountKey)"