diff --git a/samples/angular/MusicStore/Startup.cs b/samples/angular/MusicStore/Startup.cs
index 3d5e2636..a367d28f 100755
--- a/samples/angular/MusicStore/Startup.cs
+++ b/samples/angular/MusicStore/Startup.cs
@@ -45,14 +45,17 @@ public void ConfigureServices(IServiceCollection services)
                 options.AddPolicy("app-ManageStore", new AuthorizationPolicyBuilder().RequireClaim("app-ManageStore", "Allowed").Build());
             });
 
-            Mapper.CreateMap<AlbumChangeDto, Album>();
-            Mapper.CreateMap<Album, AlbumChangeDto>();
-            Mapper.CreateMap<Album, AlbumResultDto>();
-            Mapper.CreateMap<AlbumResultDto, Album>();
-            Mapper.CreateMap<Artist, ArtistResultDto>();
-            Mapper.CreateMap<ArtistResultDto, Artist>();
-            Mapper.CreateMap<Genre, GenreResultDto>();
-            Mapper.CreateMap<GenreResultDto, Genre>();
+            Mapper.Initialize(cfg =>
+            {
+                cfg.CreateMap<AlbumChangeDto, Album>();
+                cfg.CreateMap<Album, AlbumChangeDto>();
+                cfg.CreateMap<Album, AlbumResultDto>();
+                cfg.CreateMap<AlbumResultDto, Album>();
+                cfg.CreateMap<Artist, ArtistResultDto>();
+                cfg.CreateMap<ArtistResultDto, Artist>();
+                cfg.CreateMap<Genre, GenreResultDto>();
+                cfg.CreateMap<GenreResultDto, Genre>();
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/samples/angular/MusicStore/project.json b/samples/angular/MusicStore/project.json
index d341cf13..ac5a9387 100755
--- a/samples/angular/MusicStore/project.json
+++ b/samples/angular/MusicStore/project.json
@@ -29,7 +29,7 @@
     "Microsoft.Extensions.Logging.Debug": "1.0.0",
     "Microsoft.EntityFrameworkCore.SQLite": "1.0.0",
     "Microsoft.AspNetCore.AngularServices": "1.0.0-*",
-    "AutoMapper": "4.1.1"
+  "AutoMapper": "5.0.2"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/samples/react/MusicStore/Startup.cs b/samples/react/MusicStore/Startup.cs
index 4ea3fec3..1bc6003d 100755
--- a/samples/react/MusicStore/Startup.cs
+++ b/samples/react/MusicStore/Startup.cs
@@ -47,14 +47,17 @@ public void ConfigureServices(IServiceCollection services)
                 options.AddPolicy("app-ManageStore", new AuthorizationPolicyBuilder().RequireClaim("app-ManageStore", "Allowed").Build());
             });
 
-            Mapper.CreateMap<AlbumChangeDto, Album>();
-            Mapper.CreateMap<Album, AlbumChangeDto>();
-            Mapper.CreateMap<Album, AlbumResultDto>();
-            Mapper.CreateMap<AlbumResultDto, Album>();
-            Mapper.CreateMap<Artist, ArtistResultDto>();
-            Mapper.CreateMap<ArtistResultDto, Artist>();
-            Mapper.CreateMap<Genre, GenreResultDto>();
-            Mapper.CreateMap<GenreResultDto, Genre>();
+            Mapper.Initialize(cfg =>
+            {
+                cfg.CreateMap<AlbumChangeDto, Album>();
+                cfg.CreateMap<Album, AlbumChangeDto>();
+                cfg.CreateMap<Album, AlbumResultDto>();
+                cfg.CreateMap<AlbumResultDto, Album>();
+                cfg.CreateMap<Artist, ArtistResultDto>();
+                cfg.CreateMap<ArtistResultDto, Artist>();
+                cfg.CreateMap<Genre, GenreResultDto>();
+                cfg.CreateMap<GenreResultDto, Genre>();
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/samples/react/MusicStore/project.json b/samples/react/MusicStore/project.json
index faebf7ac..6f5c801b 100755
--- a/samples/react/MusicStore/project.json
+++ b/samples/react/MusicStore/project.json
@@ -29,7 +29,7 @@
     "Microsoft.Extensions.Logging.Debug": "1.0.0",
     "Microsoft.EntityFrameworkCore.SQLite": "1.0.0",
     "Microsoft.AspNetCore.ReactServices": "1.0.0-*",
-    "AutoMapper": "4.1.1"
+  "AutoMapper": "5.0.2"
   },
   "frameworks": {
     "netcoreapp1.0": {