diff --git a/src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml b/src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml
index ea6fdbfbc..f843973f8 100644
--- a/src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml
+++ b/src/Services/Identity/Identity.API/Views/Account/LoggedOut.cshtml
@@ -1,4 +1,4 @@
-@model Identity.API.Models.AccountViewModels.LoggedOutViewModel
+@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.LoggedOutViewModel
 
 <div class="container page-header">
     <h1>
diff --git a/src/Services/Identity/Identity.API/Views/Account/Login.cshtml b/src/Services/Identity/Identity.API/Views/Account/Login.cshtml
index da36c31a4..315810419 100644
--- a/src/Services/Identity/Identity.API/Views/Account/Login.cshtml
+++ b/src/Services/Identity/Identity.API/Views/Account/Login.cshtml
@@ -1,7 +1,7 @@
 @using System.Collections.Generic
 @using Microsoft.AspNetCore.Http
 @using Microsoft.AspNetCore.Http.Authentication
-@model Identity.API.Models.AccountViewModels.LoginViewModel
+@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.LoginViewModel
 
 
 @{
diff --git a/src/Services/Identity/Identity.API/Views/Account/Logout.cshtml b/src/Services/Identity/Identity.API/Views/Account/Logout.cshtml
index cbd50bd8d..f248fd6fe 100644
--- a/src/Services/Identity/Identity.API/Views/Account/Logout.cshtml
+++ b/src/Services/Identity/Identity.API/Views/Account/Logout.cshtml
@@ -1,4 +1,4 @@
-@model Identity.API.Models.AccountViewModels.LogoutViewModel
+@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.LogoutViewModel
 
 <div class="container logout-page">
     <div class="page-header">
diff --git a/src/Services/Identity/Identity.API/Views/Account/Register.cshtml b/src/Services/Identity/Identity.API/Views/Account/Register.cshtml
index aad68e9cc..838dad5c7 100644
--- a/src/Services/Identity/Identity.API/Views/Account/Register.cshtml
+++ b/src/Services/Identity/Identity.API/Views/Account/Register.cshtml
@@ -1,5 +1,4 @@
-@using Identity.API.Models.AccountViewModels
-@model RegisterViewModel
+@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.RegisterViewModel
 @{
     ViewData["Title"] = "Register";
 }
diff --git a/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml b/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
index 1304e965a..03f026bda 100644
--- a/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
+++ b/src/Services/Identity/Identity.API/Views/Consent/Index.cshtml
@@ -1,4 +1,4 @@
-@model Identity.API.Models.AccountViewModels.ConsentViewModel
+@model Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.ConsentViewModel
 
 <div class="container page-consent">
     <div class="row page-header">
diff --git a/src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml b/src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml
index 2609a6490..2910fdba9 100644
--- a/src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml
+++ b/src/Services/Identity/Identity.API/Views/Consent/_ScopeListItem.cshtml
@@ -1,4 +1,4 @@
-@model Identity.API.Models.AccountViewModels.ScopeViewModel
+@model  Microsoft.eShopOnContainers.Services.Identity.API.Models.AccountViewModels.ScopeViewModel
 
 <li class="list-group-item">
     <label>
diff --git a/src/Services/Identity/Identity.API/Views/Shared/Error.cshtml b/src/Services/Identity/Identity.API/Views/Shared/Error.cshtml
index a2ea7258f..0c94eee4d 100644
--- a/src/Services/Identity/Identity.API/Views/Shared/Error.cshtml
+++ b/src/Services/Identity/Identity.API/Views/Shared/Error.cshtml
@@ -1,4 +1,4 @@
-@model IdentityServer4.Quickstart.UI.Models.ErrorViewModel
+@model Microsoft.eShopOnContainers.Services.Identity.API.Models.ErrorViewModel
 
 @{
     var error = Model?.Error?.Error;
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/OrderingDbContextDesigner.cs b/src/Services/Ordering/Ordering.API/Infrastructure/OrderingDbContextDesigner.cs
deleted file mode 100644
index 5d14c55e6..000000000
--- a/src/Services/Ordering/Ordering.API/Infrastructure/OrderingDbContextDesigner.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Design;
-using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure;
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-
-namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure
-{
-    public class OrderingDbContextDesigner : IDesignTimeDbContextFactory<OrderingContext>
-    {
-
- 
-        public OrderingContext CreateDbContext(string[] args)
-        {
-            var options = new DbContextOptionsBuilder<OrderingContext>();
-            options.UseSqlServer("Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
-                sqlServerOptionsAction: sqlOptions =>
-                {
-                    sqlOptions.MigrationsAssembly(typeof(Startup).GetTypeInfo().Assembly.GetName().Name);
-                });
-            return OrderingContext.CreateForEFDesignTools(options.Options);
-        }
-
-    }
-}
diff --git a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
index 3fe60a2c2..916ee05cb 100644
--- a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
+++ b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
@@ -31,15 +31,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Infrastructure
 
         private readonly IMediator _mediator;
 
-       
-        public static OrderingContext CreateForEFDesignTools(DbContextOptions options)
-        {
-            return new OrderingContext(options);
-        }
+        private OrderingContext(DbContextOptions<OrderingContext> options) : base (options) { }
 
-        private OrderingContext(DbContextOptions options) : base (options) { }
-
-        public OrderingContext(DbContextOptions options, IMediator mediator) : base(options)
+        public OrderingContext(DbContextOptions<OrderingContext> options, IMediator mediator) : base(options)
         {
             _mediator = mediator ?? throw new ArgumentNullException(nameof(mediator));