diff --git a/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs b/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs
index d54b5add5..21e1037b1 100644
--- a/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs
+++ b/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs
@@ -89,19 +89,19 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands
         }
 
 
-        public class OrderItemDTO
+        public record OrderItemDTO
         {
-            public int ProductId { get; set; }
+            public int ProductId { get; init; }
 
-            public string ProductName { get; set; }
+            public string ProductName { get; init; }
 
-            public decimal UnitPrice { get; set; }
+            public decimal UnitPrice { get; init; }
 
-            public decimal Discount { get; set; }
+            public decimal Discount { get; init; }
 
-            public int Units { get; set; }
+            public int Units { get; init; }
 
-            public string PictureUrl { get; set; }
+            public string PictureUrl { get; init; }
         }
     }
 }
diff --git a/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderDraftCommandHandler.cs b/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderDraftCommandHandler.cs
index 2c315248b..e51b39f02 100644
--- a/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderDraftCommandHandler.cs
+++ b/src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderDraftCommandHandler.cs
@@ -4,7 +4,6 @@
     using global::Ordering.API.Application.Models;
     using MediatR;
     using Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Services;
-    using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Idempotency;
     using System;
     using System.Collections.Generic;
     using System.Linq;
@@ -42,10 +41,10 @@
     }
 
 
-    public class OrderDraftDTO
+    public record OrderDraftDTO
     {
-        public IEnumerable<OrderItemDTO> OrderItems { get; set; }
-        public decimal Total { get; set; }
+        public IEnumerable<OrderItemDTO> OrderItems { get; init; }
+        public decimal Total { get; init; }
 
         public static OrderDraftDTO FromOrder(Order order)
         {
diff --git a/src/Services/Ordering/Ordering.API/Application/Models/BasketItem.cs b/src/Services/Ordering/Ordering.API/Application/Models/BasketItem.cs
index 271524c69..16830919d 100644
--- a/src/Services/Ordering/Ordering.API/Application/Models/BasketItem.cs
+++ b/src/Services/Ordering/Ordering.API/Application/Models/BasketItem.cs
@@ -7,12 +7,12 @@ namespace Ordering.API.Application.Models
 {
     public class BasketItem
     {
-        public string Id { get; set; }
-        public int ProductId { get; set; }
-        public string ProductName { get; set; }
-        public decimal UnitPrice { get; set; }
-        public decimal OldUnitPrice { get; set; }
-        public int Quantity { get; set; }
-        public string PictureUrl { get; set; }
+        public string Id { get; init; }
+        public int ProductId { get; init; }
+        public string ProductName { get; init; }
+        public decimal UnitPrice { get; init; }
+        public decimal OldUnitPrice { get; init; }
+        public int Quantity { get; init; }
+        public string PictureUrl { get; init; }
     }
 }
diff --git a/src/Services/Ordering/Ordering.API/Application/Queries/OrderViewModel.cs b/src/Services/Ordering/Ordering.API/Application/Queries/OrderViewModel.cs
index a4f5eb0a9..84f9f3f40 100644
--- a/src/Services/Ordering/Ordering.API/Application/Queries/OrderViewModel.cs
+++ b/src/Services/Ordering/Ordering.API/Application/Queries/OrderViewModel.cs
@@ -3,39 +3,39 @@ using System.Collections.Generic;
 
 namespace Microsoft.eShopOnContainers.Services.Ordering.API.Application.Queries
 {
-    public class Orderitem
+    public record Orderitem
     {
-        public string productname { get; set; }
-        public int units { get; set; }
-        public double unitprice { get; set; }
-        public string pictureurl { get; set; }
+        public string productname { get; init; }
+        public int units { get; init; }
+        public double unitprice { get; init; }
+        public string pictureurl { get; init; }
     }
 
-    public class Order
+    public record Order
     {
-        public int ordernumber { get; set; }
-        public DateTime date { get; set; }
-        public string status { get; set; }
-        public string description { get; set; }
-        public string street { get; set; }
-        public string city { get; set; }
-        public string zipcode { get; set; }
-        public string country { get; set; }
+        public int ordernumber { get; init; }
+        public DateTime date { get; init; }
+        public string status { get; init; }
+        public string description { get; init; }
+        public string street { get; init; }
+        public string city { get; init; }
+        public string zipcode { get; init; }
+        public string country { get; init; }
         public List<Orderitem> orderitems { get; set; }
         public decimal total { get; set; }
     }
 
-    public class OrderSummary
+    public record OrderSummary
     {
-        public int ordernumber { get; set; }
-        public DateTime date { get; set; }
-        public string status { get; set; }
-        public double total { get; set; }
+        public int ordernumber { get; init; }
+        public DateTime date { get; init; }
+        public string status { get; init; }
+        public double total { get; init; }
     }
 
-    public class CardType
+    public record CardType
     {
-        public int Id { get; set; }
-        public string Name { get; set; }
+        public int Id { get; init; }
+        public string Name { get; init; }
     }
 }
diff --git a/src/Services/Ordering/Ordering.API/Dockerfile b/src/Services/Ordering/Ordering.API/Dockerfile
index 0c841c4ba..012fb97dc 100644
--- a/src/Services/Ordering/Ordering.API/Dockerfile
+++ b/src/Services/Ordering/Ordering.API/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
 
 # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
index fc6b14681..d21305d11 100644
--- a/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
+++ b/src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
 
 # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
diff --git a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile
index db71e7330..29eb9bd6d 100644
--- a/src/Services/Ordering/Ordering.SignalrHub/Dockerfile
+++ b/src/Services/Ordering/Ordering.SignalrHub/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /src
 
 # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles