diff --git a/src/PopForums.AzureKit/PopForums.AzureKit.csproj b/src/PopForums.AzureKit/PopForums.AzureKit.csproj
index e95c639b..e0dbe16f 100644
--- a/src/PopForums.AzureKit/PopForums.AzureKit.csproj
+++ b/src/PopForums.AzureKit/PopForums.AzureKit.csproj
@@ -24,11 +24,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.1" />
     <PackageReference Include="Microsoft.Azure.Search" Version="10.1.0" />
+    <PackageReference Include="Microsoft.Azure.Storage.Queue" Version="11.1.3" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="StackExchange.Redis" Version="2.0.601" />
-    <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/PopForums.AzureKit/Queue/AwardCalculationQueueRepository.cs b/src/PopForums.AzureKit/Queue/AwardCalculationQueueRepository.cs
index 1e160e7f..c676d79c 100644
--- a/src/PopForums.AzureKit/Queue/AwardCalculationQueueRepository.cs
+++ b/src/PopForums.AzureKit/Queue/AwardCalculationQueueRepository.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Queue;
+using Microsoft.Azure.Storage;
+using Microsoft.Azure.Storage.Queue;
 using Newtonsoft.Json;
 using PopForums.Configuration;
 using PopForums.Models;
diff --git a/src/PopForums.AzureKit/Queue/EmailQueueRepository.cs b/src/PopForums.AzureKit/Queue/EmailQueueRepository.cs
index 4b02edb3..c42bdbec 100644
--- a/src/PopForums.AzureKit/Queue/EmailQueueRepository.cs
+++ b/src/PopForums.AzureKit/Queue/EmailQueueRepository.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Queue;
+using Microsoft.Azure.Storage;
+using Microsoft.Azure.Storage.Queue;
 using Newtonsoft.Json;
 using PopForums.Configuration;
 using PopForums.Email;
diff --git a/src/PopForums.AzureKit/Queue/SearchIndexQueueRepository.cs b/src/PopForums.AzureKit/Queue/SearchIndexQueueRepository.cs
index c62de188..3cfeca18 100644
--- a/src/PopForums.AzureKit/Queue/SearchIndexQueueRepository.cs
+++ b/src/PopForums.AzureKit/Queue/SearchIndexQueueRepository.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using Microsoft.WindowsAzure.Storage;
-using Microsoft.WindowsAzure.Storage.Queue;
+using Microsoft.Azure.Storage;
+using Microsoft.Azure.Storage.Queue;
 using Newtonsoft.Json;
 using PopForums.Configuration;
 using PopForums.Models;
diff --git a/src/PopForums.Web/wwwroot/lib/PopForums/package.json b/src/PopForums.Web/wwwroot/lib/PopForums/package.json
index 1d0f2431..ecf29ecb 100644
--- a/src/PopForums.Web/wwwroot/lib/PopForums/package.json
+++ b/src/PopForums.Web/wwwroot/lib/PopForums/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@popworldmedia/popforums",
-  "version": "17.0.0-prerelease.102",
+  "version": "17.0.0-prerelease.104",
   "description": "POP Forums client side",
   "scripts": {},
   "repository": {