diff --git a/README.md b/README.md
index 2ea2b7982..8cb6e044d 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,12 @@
 
 Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers.
 
+## SPA Application
+
+![](img/eshop-spa-app-home.png)
+
+## MVC application
+
 ![](img/eshop-webmvc-app-screenshot.png)
 
 ## Build Status (GitHub Actions)
diff --git a/img/eshop-spa-app-home.png b/img/eshop-spa-app-home.png
new file mode 100644
index 000000000..a7093903d
Binary files /dev/null and b/img/eshop-spa-app-home.png differ
diff --git a/img/eshop-webmvc-app-screenshot.png b/img/eshop-webmvc-app-screenshot.png
index 0c02fe8ed..9e354facd 100644
Binary files a/img/eshop-webmvc-app-screenshot.png and b/img/eshop-webmvc-app-screenshot.png differ
diff --git a/src/Services/Catalog/Catalog.API/Setup/CatalogBrands.csv b/src/Services/Catalog/Catalog.API/Setup/CatalogBrands.csv
index 95c9ee64c..2e6571fb1 100644
--- a/src/Services/Catalog/Catalog.API/Setup/CatalogBrands.csv
+++ b/src/Services/Catalog/Catalog.API/Setup/CatalogBrands.csv
@@ -1,8 +1,3 @@
 CatalogBrand
-Azure
 .NET 
-Visual Studio 
-SQL Server
 Other
-CatalogBrandTestOne
-CatalogBrandTestTwo
\ No newline at end of file
diff --git a/src/Services/Catalog/Catalog.API/Setup/CatalogItems-MVC.zip b/src/Services/Catalog/Catalog.API/Setup/CatalogItems-MVC.zip
new file mode 100644
index 000000000..1bacd405c
Binary files /dev/null and b/src/Services/Catalog/Catalog.API/Setup/CatalogItems-MVC.zip differ
diff --git a/src/Services/Catalog/Catalog.API/Setup/CatalogItems-SPA.zip b/src/Services/Catalog/Catalog.API/Setup/CatalogItems-SPA.zip
new file mode 100644
index 000000000..5a2099705
Binary files /dev/null and b/src/Services/Catalog/Catalog.API/Setup/CatalogItems-SPA.zip differ
diff --git a/src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv b/src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv
index 430d52f20..cf2054ba7 100644
--- a/src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv
+++ b/src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv
@@ -3,12 +3,13 @@ T-Shirt,.NET,".NET Bot Black Hoodie, and more",.NET Bot Black Hoodie,19.5,1.png,
 Mug,.NET,.NET Black & White Mug,.NET Black & White Mug,8.50,2.png,89,true
 T-Shirt,Other,Prism White T-Shirt,Prism White T-Shirt,12,3.png,56,false
 T-Shirt,.NET,.NET Foundation T-shirt,.NET Foundation T-shirt,12,4.png,120,false
-Sheet,Other,Roslyn Red Sheet,Roslyn Red Sheet,8.5,5.png,55,false
+Pin,Other,Roslyn Red Pin,Roslyn Red Pin,8.5,5.png,55,false
 T-Shirt,.NET,.NET Blue Hoodie,.NET Blue Hoodie,12,6.png,17,false
 T-Shirt,Other,Roslyn Red T-Shirt,Roslyn Red T-Shirt,12,7.png,8,false
 T-Shirt,Other,Kudu Purple Hoodie,Kudu Purple Hoodie,8.5,8.png,34,false
 Mug,Other,Cup<T> White Mug,Cup<T> White Mug,12,9.png,76,false
-Sheet,.NET,.NET Foundation Sheet,.NET Foundation Sheet,12,10.png,11,false
-Sheet,.NET,Cup<T> Sheet,Cup<T> Sheet,8.5,11.png,3,false
+Pin,.NET,.NET Foundation Pin,.NET Foundation Pin,12,10.png,11,false
+Pin,.NET,Cup<T> Pin,Cup<T> Pin,8.5,11.png,3,false
 T-Shirt,Other,Prism White TShirt,Prism White TShirt,12,12.png,0,false
-Mug, Other, De los Palotes, pepito, 12, 12.png, 0, false
\ No newline at end of file
+Mug,.NET,Modern .NET Black & White Mug,Modern .NET Black & White Mug,8.50,13.png,89,true
+Mug,Other,Modern Cup<T> White Mug,Modern Cup<T> White Mug,12,14.png,76,false
diff --git a/src/Services/Catalog/Catalog.API/Setup/CatalogItems.zip b/src/Services/Catalog/Catalog.API/Setup/CatalogItems.zip
index 6d3edfb3c..5a2099705 100644
Binary files a/src/Services/Catalog/Catalog.API/Setup/CatalogItems.zip and b/src/Services/Catalog/Catalog.API/Setup/CatalogItems.zip differ
diff --git a/src/Services/Catalog/Catalog.API/Setup/CatalogTypes.csv b/src/Services/Catalog/Catalog.API/Setup/CatalogTypes.csv
index ae636c265..fc2bac68c 100644
--- a/src/Services/Catalog/Catalog.API/Setup/CatalogTypes.csv
+++ b/src/Services/Catalog/Catalog.API/Setup/CatalogTypes.csv
@@ -1,7 +1,4 @@
 CatalogType
 Mug
 T-Shirt
-Sheet
-USB Memory Stick
-CatalogTypeTestOne
-CatalogTypeTestTwo
\ No newline at end of file
+Pin
\ No newline at end of file
diff --git a/src/Services/Catalog/Catalog.API/Setup/README.md b/src/Services/Catalog/Catalog.API/Setup/README.md
new file mode 100644
index 000000000..e3c5cccbc
--- /dev/null
+++ b/src/Services/Catalog/Catalog.API/Setup/README.md
@@ -0,0 +1,10 @@
+# Catalog set up
+
+The catalog images have been updated to the new SPA looks.
+
+If you want to use the classical images:
+
+1. Drop the `Microsoft.eShopOnContainers.Services.CatalogDb` database from the `sqldata` container.
+2. Rename `CatalogItems-MVC.zip` as `CatalogItems.zip`
+3. Rebuild the `catalog-api` service with `docker-compose build catalog-api`
+4. Restart the application as usual
diff --git a/src/Web/WebMVC/Controllers/CatalogController.cs b/src/Web/WebMVC/Controllers/CatalogController.cs
index 0ac5ecacc..16e2d417f 100644
--- a/src/Web/WebMVC/Controllers/CatalogController.cs
+++ b/src/Web/WebMVC/Controllers/CatalogController.cs
@@ -16,7 +16,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 
         public async Task<IActionResult> Index(int? BrandFilterApplied, int? TypesFilterApplied, int? page, [FromQuery] string errorMsg)
         {
-            var itemsPage = 10;
+            var itemsPage = 9;
             var catalog = await _catalogSvc.GetCatalogItems(page ?? 0, itemsPage, BrandFilterApplied, TypesFilterApplied);
             var vm = new IndexViewModel()
             {