diff --git a/src/MusicStore.Spa/Models/IdentityModels.cs b/src/MusicStore.Spa/Models/IdentityModels.cs
index 23d88fef88..7ccfba846c 100644
--- a/src/MusicStore.Spa/Models/IdentityModels.cs
+++ b/src/MusicStore.Spa/Models/IdentityModels.cs
@@ -10,7 +10,7 @@ namespace MusicStore.Models
 
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser> 
     {
-        public ApplicationDbContext(IServiceProvider serviceProvider, IOptionsAccessor<IdentityDbContextOptions> optionsAccessor)
+        public ApplicationDbContext(IServiceProvider serviceProvider, IOptions<IdentityDbContextOptions> optionsAccessor)
             : base(serviceProvider, optionsAccessor.Options)
         {
 
diff --git a/src/MusicStore.Spa/Models/MusicStoreContext.cs b/src/MusicStore.Spa/Models/MusicStoreContext.cs
index 4fd9968a17..1cd631f82e 100644
--- a/src/MusicStore.Spa/Models/MusicStoreContext.cs
+++ b/src/MusicStore.Spa/Models/MusicStoreContext.cs
@@ -8,7 +8,7 @@ namespace MusicStore.Models
 {
     public class MusicStoreContext : DbContext
     {
-        public MusicStoreContext(IServiceProvider serviceProvider, IOptionsAccessor<MusicStoreDbContextOptions> optionsAccessor)
+        public MusicStoreContext(IServiceProvider serviceProvider, IOptions<MusicStoreDbContextOptions> optionsAccessor)
             : base(serviceProvider, optionsAccessor.Options)
         {
 
diff --git a/src/MusicStore.Spa/Models/SampleData.cs b/src/MusicStore.Spa/Models/SampleData.cs
index 6e250eb504..6d87b9ad67 100644
--- a/src/MusicStore.Spa/Models/SampleData.cs
+++ b/src/MusicStore.Spa/Models/SampleData.cs
@@ -55,7 +55,7 @@ namespace MusicStore.Models
 
         private static async Task CreateAdminUser(IServiceProvider serviceProvider)
         {
-            var options = serviceProvider.GetService<IOptionsAccessor<IdentityDbContextOptions>>().Options;
+            var options = serviceProvider.GetService<IOptions<IdentityDbContextOptions>>().Options;
             const string adminRole = "Administrator";
 
             var userManager = serviceProvider.GetService<UserManager<ApplicationUser>>();
diff --git a/src/MusicStore.Spa/Startup.cs b/src/MusicStore.Spa/Startup.cs
index 9b461af07a..f628f6bd64 100644
--- a/src/MusicStore.Spa/Startup.cs
+++ b/src/MusicStore.Spa/Startup.cs
@@ -28,14 +28,14 @@ namespace MusicStore.Spa
         public void ConfigureServices(IServiceCollection services)
         {
             // Add options accessors to the service container
-            services.ConfigureOptions<IdentityDbContextOptions>(options =>
+            services.Configure<IdentityDbContextOptions>(options =>
             {
                 options.DefaultAdminUserName = Configuration.Get("DefaultAdminUsername");
                 options.DefaultAdminPassword = Configuration.Get("DefaultAdminPassword");
                 options.UseSqlServer(Configuration.Get("Data:IdentityConnection:ConnectionString"));
             });
 
-            services.ConfigureOptions<MusicStoreDbContextOptions>(options =>
+            services.Configure<MusicStoreDbContextOptions>(options =>
                 options.UseSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString")));
 
             // Add MVC services to the service container
@@ -55,8 +55,6 @@ namespace MusicStore.Spa
 
         public void Configure(IApplicationBuilder app)
         {
-            app.UsePerRequestServices();
-
             // Initialize the sample data
             SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait();
             SampleData.InitializeIdentityDatabaseAsync(app.ApplicationServices).Wait();
diff --git a/src/MusicStore/Mocks/StartupSocialTesting.cs b/src/MusicStore/Mocks/StartupSocialTesting.cs
index 17908a1f91..ba741c3ba1 100644
--- a/src/MusicStore/Mocks/StartupSocialTesting.cs
+++ b/src/MusicStore/Mocks/StartupSocialTesting.cs
@@ -40,7 +40,7 @@ namespace MusicStore
             //Note: ErrorPageOptions.ShowAll to be used only at development time. Not recommended for production.
             app.UseErrorPage(ErrorPageOptions.ShowAll);
 
-            app.UsePerRequestServices(services =>
+            app.UseServices(services =>
             {
                 //If this type is present - we're on mono
                 var runningOnMono = Type.GetType("Mono.Runtime") != null;
@@ -60,7 +60,7 @@ namespace MusicStore
                 services.AddScoped<MusicStoreContext>();
 
                 // Configure DbContext           
-                services.ConfigureOptions<MusicStoreDbContextOptions>(options =>
+                services.Configure<MusicStoreDbContextOptions>(options =>
                 {
                     options.DefaultAdminUserName = configuration.Get("DefaultAdminUsername");
                     options.DefaultAdminPassword = configuration.Get("DefaultAdminPassword");
diff --git a/src/MusicStore/Models/MusicStoreContext.cs b/src/MusicStore/Models/MusicStoreContext.cs
index 7339cdfc8a..7f1044f991 100644
--- a/src/MusicStore/Models/MusicStoreContext.cs
+++ b/src/MusicStore/Models/MusicStoreContext.cs
@@ -11,7 +11,7 @@ namespace MusicStore.Models
 
     public class MusicStoreContext : IdentityDbContext<ApplicationUser>
     {
-        public MusicStoreContext(IServiceProvider serviceProvider, IOptionsAccessor<MusicStoreDbContextOptions> optionsAccessor)
+        public MusicStoreContext(IServiceProvider serviceProvider, IOptions<MusicStoreDbContextOptions> optionsAccessor)
                     : base(serviceProvider, optionsAccessor.Options)
         {
 
diff --git a/src/MusicStore/Models/SampleData.cs b/src/MusicStore/Models/SampleData.cs
index bbc99e7867..e85cefb37c 100644
--- a/src/MusicStore/Models/SampleData.cs
+++ b/src/MusicStore/Models/SampleData.cs
@@ -78,7 +78,7 @@ namespace MusicStore.Models
         /// <returns></returns>
         private static async Task CreateAdminUser(IServiceProvider serviceProvider)
         {
-            var options = serviceProvider.GetService<IOptionsAccessor<MusicStoreDbContextOptions>>().Options;
+            var options = serviceProvider.GetService<IOptions<MusicStoreDbContextOptions>>().Options;
             //const string adminRole = "Administrator";
 
             var userManager = serviceProvider.GetService<UserManager<ApplicationUser>>();
diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs
index 4d49de0ec0..61db98a047 100644
--- a/src/MusicStore/Startup.cs
+++ b/src/MusicStore/Startup.cs
@@ -44,7 +44,7 @@ namespace MusicStore
             services.AddScoped<MusicStoreContext>();
 
             // Configure DbContext           
-            services.ConfigureOptions<MusicStoreDbContextOptions>(options =>
+            services.Configure<MusicStoreDbContextOptions>(options =>
             {
                 options.DefaultAdminUserName = Configuration.Get("DefaultAdminUsername");
                 options.DefaultAdminPassword = Configuration.Get("DefaultAdminPassword");
@@ -125,9 +125,6 @@ namespace MusicStore
 
         public void Configure(IApplicationBuilder app)
         {
-            // Add services from ConfigureServices
-            app.UsePerRequestServices();
-
             //Configure SignalR
             app.UseSignalR();
 
diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs
index 28936d7355..7582083e32 100644
--- a/src/MusicStore/StartupNtlmAuthentication.cs
+++ b/src/MusicStore/StartupNtlmAuthentication.cs
@@ -66,7 +66,7 @@ namespace MusicStore
             //Note: ErrorPageOptions.ShowAll to be used only at development time. Not recommended for production.
             app.UseErrorPage(ErrorPageOptions.ShowAll);
 
-            app.UsePerRequestServices(services =>
+            app.UseServices(services =>
             {
                 // Add EF services to the services container
                 services.AddEntityFramework()
@@ -75,7 +75,7 @@ namespace MusicStore
                 services.AddScoped<MusicStoreContext>();
 
                 // Configure DbContext           
-                services.ConfigureOptions<MusicStoreDbContextOptions>(options =>
+                services.Configure<MusicStoreDbContextOptions>(options =>
                 {
                     options.DefaultAdminUserName = configuration.Get("DefaultAdminUsername");
                     options.DefaultAdminPassword = configuration.Get("DefaultAdminPassword");