diff --git a/coffeecard/CoffeeCard.Library/Services/v2/IProductService.cs b/coffeecard/CoffeeCard.Library/Services/v2/IProductService.cs
index e9382074..8eb6c1ca 100644
--- a/coffeecard/CoffeeCard.Library/Services/v2/IProductService.cs
+++ b/coffeecard/CoffeeCard.Library/Services/v2/IProductService.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using CoffeeCard.Models.DataTransferObjects.v2.Product;
+using CoffeeCard.Models.DataTransferObjects.v2.Products;
 using CoffeeCard.Models.Entities;
 
 namespace CoffeeCard.Library.Services.v2
@@ -11,8 +12,7 @@ public interface IProductService : IDisposable
         Task<IEnumerable<Product>> GetPublicProductsAsync();
         Task<IEnumerable<Product>> GetProductsForUserAsync(User user);
         Task<Product> GetProductAsync(int productId);
-        Task<ChangedProductResponse> AddProduct(AddProductRequest product);
-
-        Task<ChangedProductResponse> UpdateProduct(UpdateProductRequest product);
+        Task<DetailedProductResponse> AddProduct(AddProductRequest product);
+        Task<DetailedProductResponse> UpdateProduct(int productId, UpdateProductRequest updateProduct);
     }
 }
\ No newline at end of file
diff --git a/coffeecard/CoffeeCard.Library/Services/v2/ProductService.cs b/coffeecard/CoffeeCard.Library/Services/v2/ProductService.cs
index 666cd4ba..cba8118a 100644
--- a/coffeecard/CoffeeCard.Library/Services/v2/ProductService.cs
+++ b/coffeecard/CoffeeCard.Library/Services/v2/ProductService.cs
@@ -63,7 +63,7 @@ private async Task<bool> CheckProductUniquenessAsync(string name, int price)
             return product == null;
         }
 
-        public async Task<ChangedProductResponse> AddProduct(AddProductRequest newProduct)
+        public async Task<DetailedProductResponse> AddProduct(AddProductRequest newProduct)
         {
             var unique = await CheckProductUniquenessAsync(newProduct.Name, newProduct.Price);
             if (!unique)
@@ -91,13 +91,11 @@ public async Task<ChangedProductResponse> AddProduct(AddProductRequest newProduc
             }).ToList();
 
             _context.ProductUserGroups.AddRange(productUserGroups);
-
-
             await _context.SaveChangesAsync();
 
-
-            var result = new ChangedProductResponse
+            var result = new DetailedProductResponse
             {
+                Id = product.Id,
                 Price = product.Price,
                 Description = product.Description,
                 Name = product.Name,
@@ -108,19 +106,21 @@ public async Task<ChangedProductResponse> AddProduct(AddProductRequest newProduc
             return result;
         }
 
-        public async Task<ChangedProductResponse> UpdateProduct(UpdateProductRequest changedProduct)
+        public async Task<DetailedProductResponse> UpdateProduct(int productId, UpdateProductRequest updateProduct)
         {
-            var product = await GetProductAsync(changedProduct.Id);
-            product.Price = changedProduct.Price;
-            product.Description = changedProduct.Description;
-            product.NumberOfTickets = changedProduct.NumberOfTickets;
-            product.Name = changedProduct.Name;
-            product.Visible = changedProduct.Visible;
+            var product = await GetProductAsync(productId);
+
+            product.Price = updateProduct.Price;
+            product.Description = updateProduct.Description;
+            product.NumberOfTickets = updateProduct.NumberOfTickets;
+            product.Name = updateProduct.Name;
+            product.Visible = updateProduct.Visible;
 
             await _context.SaveChangesAsync();
 
-            var result = new ChangedProductResponse
+            var result = new DetailedProductResponse
             {
+                Id = product.Id,
                 Price = product.Price,
                 Description = product.Description,
                 Name = product.Name,
diff --git a/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/AddProductRequest.cs b/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/AddProductRequest.cs
index 6c42d988..b1ee35e3 100644
--- a/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/AddProductRequest.cs
+++ b/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/AddProductRequest.cs
@@ -10,11 +10,12 @@ namespace CoffeeCard.Models.DataTransferObjects.v2.Product
     /// </summary>
     /// <example>
     /// {
-    ///     "Name": "Latte",
-    ///     "Price": 25,
-    ///     "NumberOfTickets": 10,
-    ///     "Description": "xxx",
-    ///     "Visible": true
+    ///     "name": "Latte",
+    ///     "price": 25,
+    ///     "numberOfTickets": 10,
+    ///     "description": "Milkbased espresso drink",
+    ///     "visible": true,
+    ///     "allowedUserGroups": ["Customer"]
     /// }
     /// </example>
     public class AddProductRequest
@@ -23,7 +24,7 @@ public class AddProductRequest
         /// Gets or sets the price of the product.
         /// </summary>
         /// <value>Product Price</value>
-        /// <example> 10 </example>
+        /// <example>10</example>
         [Required]
         [Range(0, int.MaxValue, ErrorMessage = "Price must be a non-negative integer.")]
         public int Price { get; set; }
@@ -31,8 +32,8 @@ public class AddProductRequest
         /// <summary>
         /// Gets or sets the number of tickets associated with the product.
         /// </summary>
-        /// <value> Number of tickets associated with a product </value>
-        /// <example> 5 </example>
+        /// <value>Number of tickets associated with a product</value>
+        /// <example>5</example>
         [Required]
         [Range(0, int.MaxValue, ErrorMessage = "Number of Tickets must be a non-negative integer.")]
         public int NumberOfTickets { get; set; }
@@ -40,8 +41,8 @@ public class AddProductRequest
         /// <summary>
         /// Gets or sets the name of the product.
         /// </summary>
-        /// <value> Product Name </value>
-        /// <example> Latte </example>
+        /// <value>Product Name</value>
+        /// <example>Latte</example>
         [Required]
         [MinLength(1, ErrorMessage = "Name cannot be an empty string.")]
         public string Name { get; set; }
@@ -49,8 +50,8 @@ public class AddProductRequest
         /// <summary>
         /// Gets or sets the description of the product.
         /// </summary>
-        /// <value> Product Description </value>
-        /// <example> A homemade latte with soy milk </example>
+        /// <value>Product Description</value>
+        /// <example>A homemade latte with soy milk</example>
         [Required]
         [MinLength(1, ErrorMessage = "Description cannot be an empty string.")]
         public string Description { get; set; }
@@ -58,11 +59,16 @@ public class AddProductRequest
         /// <summary>
         /// Gets or sets the visibility of the product. Default is true.
         /// </summary>
-        /// <value> Product Visibility </value>
-        /// <example> true </example>
+        /// <value>Product Visibility</value>
+        /// <example>true</example>
         [DefaultValue(true)]
         public bool Visible { get; set; } = true;
 
+
+        /// <summary>
+        /// List of UserGroups who are entitled to purchase the product
+        /// </summary>
+        /// <example>["Customer"]</example>
         [Required]
         public IEnumerable<UserGroup> AllowedUserGroups { get; set; }
 
diff --git a/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/ChangedProductResponse.cs b/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/DetailedProductResponse.cs
similarity index 62%
rename from coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/ChangedProductResponse.cs
rename to coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/DetailedProductResponse.cs
index 8a0cfba0..82acf39d 100644
--- a/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/ChangedProductResponse.cs
+++ b/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/DetailedProductResponse.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace CoffeeCard.Models.DataTransferObjects.v2.Product
@@ -7,12 +5,30 @@ namespace CoffeeCard.Models.DataTransferObjects.v2.Product
     /// <summary>
     /// Represents the product response.
     /// </summary>
-    public class ChangedProductResponse
+    /// <example>
+    /// {
+    ///     "id": 1,
+    ///     "price": 150,
+    ///     "numberOfTickets": 10,
+    ///     "name": "Espresso",
+    ///     "description": "A homemade espresso from fresh beans",
+    ///     "visible": true
+    /// }
+    /// </example>
+    public class DetailedProductResponse
     {
+        /// <summary>
+        /// Product Id
+        /// </summary>
+        /// <value>ProductId</value>
+        /// <example>1</example>
+        [Required]
+        public int Id { get; set; }
+
         /// <summary>
         /// Gets or sets the price of the product.
         /// </summary>
-        /// <example> 150 </example>
+        /// <example>150</example>
         [Required]
         [Range(0, int.MaxValue, ErrorMessage = "Price must be a non-negative integer.")]
         public int Price { get; set; }
@@ -21,7 +37,7 @@ public class ChangedProductResponse
         /// Gets or sets the number of tickets associated with the product.
         /// </summary>
         /// <value> Number of Tickets of a Product </value>
-        /// <example> 5 </example>
+        /// <example>5</example>
         [Required]
         [Range(0, int.MaxValue, ErrorMessage = "Number of tickets must be a non-negative integer.")]
         public int NumberOfTickets { get; set; }
@@ -29,8 +45,8 @@ public class ChangedProductResponse
         /// <summary>
         /// Gets or sets the name of the product.
         /// </summary>
-        /// <value> Product Name </value>
-        /// <example> Espresso </example>
+        /// <value>Product Name</value>
+        /// <example>Espresso</example>
         [Required]
         [MinLength(1, ErrorMessage = "Name cannot be an empty string.")]
         public string Name { get; set; }
@@ -38,8 +54,8 @@ public class ChangedProductResponse
         /// <summary>
         /// Gets or sets the description of the product.
         /// </summary>
-        /// <value> Product Description </value>
-        /// <example> A homemade espresso from fresh beans </example>
+        /// <value>Product Description</value>
+        /// <example>A homemade espresso from fresh beans</example>
         [Required]
         [MinLength(1, ErrorMessage = "Description cannot be an empty string.")]
         public string Description { get; set; }
@@ -47,8 +63,8 @@ public class ChangedProductResponse
         /// <summary>
         /// Gets or sets the visibility of the product.
         /// </summary>
-        /// <value> Product Visibility </value>
-        /// <example> true </example>
+        /// <value>Product Visibility</value>
+        /// <example>true</example>
         [Required]
         public bool Visible { get; set; }
     }
diff --git a/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/UpdateProductRequest.cs b/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/UpdateProductRequest.cs
index a939c1ae..a9171341 100644
--- a/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/UpdateProductRequest.cs
+++ b/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Product/UpdateProductRequest.cs
@@ -8,29 +8,20 @@ namespace CoffeeCard.Models.DataTransferObjects.v2.Product
     /// </summary>
     /// <example>
     /// {
-    ///   "Id": 1,
-    ///   "Price": 150,
-    ///   "NumberOfTickets": 10,
-    ///   "Name": "Espresso",
-    ///   "Description": "A coffee made by forcing steam through ground coffee beans.",
-    ///   "Visible": false
+    ///   "price": 150,
+    ///   "numberOfTickets": 10,
+    ///   "name": "Espresso",
+    ///   "description": "A coffee made by forcing steam through ground coffee beans.",
+    ///   "visible": false
     /// }
     /// </example>
     public class UpdateProductRequest
     {
-        /// <summary>
-        /// Gets or sets the ID of the product to update.
-        /// </summary>
-        /// <value> Product Id </value>
-        /// <example> 1 </example>
-        [Required]
-        public int Id { get; set; }
-
         /// <summary>
         /// Gets or sets the updated price of the product.
         /// </summary>
-        /// <value> Product Price </value>
-        /// <example> 10 </example>
+        /// <value>Product Price</value>
+        /// <example>10</example>
         [Required]
         [Range(0, int.MaxValue, ErrorMessage = "Price must be a non-negative integer.")]
         public int Price { get; set; }
@@ -38,8 +29,8 @@ public class UpdateProductRequest
         /// <summary>
         /// Gets or sets the updated number of tickets associated with the product.
         /// </summary>
-        /// <value> Number of Tickets of a Product </value>
-        /// <example> 5 </example>
+        /// <value>Number of Tickets of a Product</value>
+        /// <example>5</example>
         [Required]
         [Range(0, int.MaxValue, ErrorMessage = "Number of Tickets must be a non-negative integer.")]
         public int NumberOfTickets { get; set; }
@@ -47,8 +38,8 @@ public class UpdateProductRequest
         /// <summary>
         /// Gets or sets the updated name of the product.
         /// </summary>
-        /// <value> Product Name </value>
-        /// <example> Espresso </example>
+        /// <value>Product Name</value>
+        /// <example>Espresso</example>
         [Required]
         [MinLength(1, ErrorMessage = "Name cannot be an empty string.")]
         public string Name { get; set; }
@@ -56,8 +47,8 @@ public class UpdateProductRequest
         /// <summary>
         /// Gets or sets the updated description of the product.
         /// </summary>
-        /// <value> Product Description </value>
-        /// <example> A homemade espresso from fresh beans </example>
+        /// <value>Product Description</value>
+        /// <example>A homemade espresso from fresh beans</example>
         [Required]
         [MinLength(1, ErrorMessage = "Description cannot be an empty string.")]
         public string Description { get; set; }
@@ -65,8 +56,8 @@ public class UpdateProductRequest
         /// <summary>
         /// Gets or sets the updated visibility of the product. Default is true.
         /// </summary>
-        /// <value> Product Visibility </value>
-        /// <example> true </example>
+        /// <value>Product Visibility</value>
+        /// <example>true</example>
         [DefaultValue(true)]
         public bool Visible { get; set; } = true;
     }
diff --git a/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Products/ProductResponse.cs b/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Products/SimpleProductResponse.cs
similarity index 97%
rename from coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Products/ProductResponse.cs
rename to coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Products/SimpleProductResponse.cs
index b9dfad28..a8cbab5b 100644
--- a/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Products/ProductResponse.cs
+++ b/coffeecard/CoffeeCard.Models/DataTransferObjects/v2/Products/SimpleProductResponse.cs
@@ -15,7 +15,7 @@ namespace CoffeeCard.Models.DataTransferObjects.v2.Products
     ///     "isPerk": true
     /// }
     /// </example>
-    public class ProductResponse
+    public class SimpleProductResponse
     {
         /// <summary>
         /// Id of product
diff --git a/coffeecard/CoffeeCard.WebApi/Controllers/v2/ProductsController.cs b/coffeecard/CoffeeCard.WebApi/Controllers/v2/ProductsController.cs
index 36bed38f..7bb4eafc 100644
--- a/coffeecard/CoffeeCard.WebApi/Controllers/v2/ProductsController.cs
+++ b/coffeecard/CoffeeCard.WebApi/Controllers/v2/ProductsController.cs
@@ -41,28 +41,49 @@ public ProductsController(IProductService productService, ClaimsUtilities claims
         /// </summary>
         /// <param name="addProductRequest">The request containing the details of the product to be added and allowed user groups.</param>
         /// <returns> The newly added product wrapped in a InitiateProductResponse object.</returns>
-        /// <response code="200">The request was successful, and the product was added.</response>
-        [HttpPost("")]
+        /// <response code="201">Product created</response>
+        /// <response code="409">Product name already exists</response>
+        [HttpPost]
         [AuthorizeRoles(UserGroup.Board)]
-        [ProducesResponseType(typeof(ChangedProductResponse), StatusCodes.Status200OK)]
-        public async Task<IActionResult> AddProduct(AddProductRequest addProductRequest)
+        [ProducesResponseType(typeof(DetailedProductResponse), StatusCodes.Status201Created)]
+        [ProducesResponseType(typeof(ApiError), StatusCodes.Status409Conflict)]
+        public async Task<ActionResult<DetailedProductResponse>> AddProduct([FromBody] AddProductRequest addProductRequest)
         {
-            return Ok(await _productService.AddProduct(addProductRequest));
-        }
+            var product = await _productService.AddProduct(addProductRequest);
 
+            return CreatedAtAction(nameof(GetProductById), new { id = product.Id, version = 2 }, product);
+        }
 
         /// <summary>
         /// Updates a product with the specified changes.
         /// </summary>
+        /// <param name="id">Product Id</param>
         /// <param name="product">The request containing the changes to be applied to the product.</param>
         /// <returns>A response indicating the result of the update operation.</returns>
-        /// <response code="200">The request was successful, and the product was updated.</response>
-        [HttpPut("")]
+        /// <response code="200">Product updated</response>
+        /// <response code="404">Product not found</response>
+        [HttpPut("{id:int}")]
         [AuthorizeRoles(UserGroup.Board)]
-        [ProducesResponseType(typeof(ChangedProductResponse), StatusCodes.Status200OK)]
-        public async Task<IActionResult> UpdateProduct(UpdateProductRequest product)
+        [ProducesResponseType(typeof(DetailedProductResponse), StatusCodes.Status200OK)]
+        [ProducesResponseType(typeof(ApiError), StatusCodes.Status404NotFound)]
+        public async Task<ActionResult<DetailedProductResponse>> UpdateProduct(int id, [FromBody] UpdateProductRequest product)
+        {
+            return Ok(await _productService.UpdateProduct(id, product));
+        }
+
+        /// <summary>
+        /// Get Product by Id
+        /// </summary>
+        /// <param name="id">Product Id</param>
+        /// <returns>Detailed Product</returns>
+        /// <response code="200">Detailed Product</response>
+        /// <response code="404">Product not found</response>
+        [HttpGet("{id:int}")]
+        [ProducesResponseType(typeof(DetailedProductResponse), StatusCodes.Status200OK)]
+        [ProducesResponseType(typeof(ApiError), StatusCodes.Status404NotFound)]
+        public async Task<ActionResult<DetailedProductResponse>> GetProductById(int id)
         {
-            return Ok(await _productService.UpdateProduct(product));
+            return Ok(await _productService.GetProductAsync(id));
         }
 
         /// <summary>
@@ -72,8 +93,8 @@ public async Task<IActionResult> UpdateProduct(UpdateProductRequest product)
         /// <response code="200">Successful request</response>
         [HttpGet]
         [AllowAnonymous]
-        [ProducesResponseType(typeof(IEnumerable<ProductResponse>), StatusCodes.Status200OK)]
-        public async Task<ActionResult<IEnumerable<ProductResponse>>> GetProducts()
+        [ProducesResponseType(typeof(IEnumerable<SimpleProductResponse>), StatusCodes.Status200OK)]
+        public async Task<ActionResult<IEnumerable<SimpleProductResponse>>> GetProducts()
         {
             IEnumerable<Product> products;
             try
@@ -92,9 +113,9 @@ public async Task<ActionResult<IEnumerable<ProductResponse>>> GetProducts()
             return Ok(products.Select(MapProductToDto).ToList());
         }
 
-        private static ProductResponse MapProductToDto(Product product)
+        private static SimpleProductResponse MapProductToDto(Product product)
         {
-            return new ProductResponse
+            return new SimpleProductResponse
             {
                 Id = product.Id,
                 Name = product.Name,
diff --git a/coffeecard/CoffeeCard.WebApi/appsettings.json b/coffeecard/CoffeeCard.WebApi/appsettings.json
index d65081e1..a5aaf876 100644
--- a/coffeecard/CoffeeCard.WebApi/appsettings.json
+++ b/coffeecard/CoffeeCard.WebApi/appsettings.json
@@ -9,7 +9,7 @@
     "DeploymentUrl": "https://localhost:8080/"
   },
   "DatabaseSettings": {
-    "ConnectionString": "Server=localhost;Initial Catalog=master;User=sa;Password=Your_password123;TrustServerCertificate=True;",
+    "ConnectionString": "Server=mssql;Initial Catalog=master;User=sa;Password=Your_password123;TrustServerCertificate=True;",
     "SchemaName": "dbo"
   },
   "IdentitySettings": {