diff --git a/static/directives/config/config-setup-tool.html b/static/directives/config/config-setup-tool.html
index 8952c6075..c29809b02 100644
--- a/static/directives/config/config-setup-tool.html
+++ b/static/directives/config/config-setup-tool.html
@@ -297,6 +297,7 @@
                   <select class="form-control" ng-class="storageConfigError[$index].engine ? 'ng-invalid' : ''" ng-model="sc.data[0]">
                     <option value="LocalStorage">Locally mounted directory</option>
                     <option value="S3Storage">Amazon S3</option>
+                    <option value="AzureStorage">Azure Blob Storage</option>
                     <option value="GoogleCloudStorage">Google Cloud Storage</option>
                     <option value="RadosGWStorage">Ceph Object Gateway (RADOS)</option>
                     <option value="SwiftStorage">OpenStack Storage (Swift)</option>
diff --git a/static/js/core-config-setup.js b/static/js/core-config-setup.js
index 4adb1697e..b2ab62383 100644
--- a/static/js/core-config-setup.js
+++ b/static/js/core-config-setup.js
@@ -108,6 +108,14 @@ angular.module("core-config-setup", ['angularFileUpload'])
             {'name': 'port', 'title': 'S3 Port (optional)', 'placeholder': '443', 'kind': 'text', 'pattern': '^[0-9]+$', 'optional': true}
           ],
 
+          'AzureStorage': [
+            {'name': 'azure_container', 'title': 'Azure Storage Container', 'placeholder': 'container', 'kind': 'text'},
+            {'name': 'storage_path', 'title': 'Storage Directory', 'placeholder': '/path/inside/container', 'kind': 'text'},
+            {'name': 'azure_account_name', 'title': 'Azure Account Name', 'placeholder': 'accountnamehere', 'kind': 'text'},
+            {'name': 'azure_account_key', 'title': 'Azure Account Key',  'placeholder': 'accountkeyhere', 'kind': 'text', 'optional': true},
+            {'name': 'sas_token', 'title': 'Azure SAS Token',  'placeholder': 'sastokenhere', 'kind': 'text', 'optional': true},
+          ],
+
           'GoogleCloudStorage': [
             {'name': 'access_key', 'title': 'Cloud Access Key', 'placeholder': 'accesskeyhere', 'kind': 'text'},
             {'name': 'secret_key', 'title': 'Cloud Secret Key', 'placeholder': 'secretkeyhere', 'kind': 'text'},