diff --git a/src/commands/addBinding/settingSteps/StorageTypePromptStep.ts b/src/commands/addBinding/settingSteps/StorageTypePromptStep.ts
index 804124343..e11bca57f 100644
--- a/src/commands/addBinding/settingSteps/StorageTypePromptStep.ts
+++ b/src/commands/addBinding/settingSteps/StorageTypePromptStep.ts
@@ -40,7 +40,7 @@ export class StorageTypePromptStep extends AzureWizardPromptStep<IFunctionWizard
 
         if (!context.useStorageEmulator) {
             promptSteps.push(new StorageAccountListStep(
-                { kind: StorageAccountKind.Storage, performance: StorageAccountPerformance.Standard, replication: StorageAccountReplication.LRS },
+                { kind: StorageAccountKind.StorageV2, performance: StorageAccountPerformance.Standard, replication: StorageAccountReplication.LRS },
                 { kind: [StorageAccountKind.BlobStorage], learnMoreLink: 'https://aka.ms/T5o0nf' }
             ));
         }
diff --git a/src/commands/appSettings/connectionSettings/azureWebJobsStorage/StorageConnectionListStep.ts b/src/commands/appSettings/connectionSettings/azureWebJobsStorage/StorageConnectionListStep.ts
index 16114d3e0..67fe64b02 100644
--- a/src/commands/appSettings/connectionSettings/azureWebJobsStorage/StorageConnectionListStep.ts
+++ b/src/commands/appSettings/connectionSettings/azureWebJobsStorage/StorageConnectionListStep.ts
@@ -74,7 +74,7 @@ export class StorageConnectionListStep<T extends IStorageConnectionWizardContext
                 if (!(context as IStorageAzureConnectionWizard).storageAccount) {
                     promptSteps.push(new StorageAccountListStep(
                         { // INewStorageAccountDefaults
-                            kind: StorageAccountKind.Storage,
+                            kind: StorageAccountKind.StorageV2,
                             performance: StorageAccountPerformance.Standard,
                             replication: StorageAccountReplication.LRS
                         },
diff --git a/src/commands/createFunctionApp/createCreateFunctionAppComponents.ts b/src/commands/createFunctionApp/createCreateFunctionAppComponents.ts
index 66c3fd425..e27359808 100644
--- a/src/commands/createFunctionApp/createCreateFunctionAppComponents.ts
+++ b/src/commands/createFunctionApp/createCreateFunctionAppComponents.ts
@@ -48,7 +48,7 @@ export async function createCreateFunctionAppComponents(context: ICreateFunction
     const executeSteps: AzureWizardExecuteStep<IFunctionAppWizardContext>[] = [];
 
     const storageAccountCreateOptions: INewStorageAccountDefaults = {
-        kind: StorageAccountKind.Storage,
+        kind: StorageAccountKind.StorageV2,
         performance: StorageAccountPerformance.Standard,
         replication: StorageAccountReplication.LRS
     };