diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Settings/DeviceTagsPageTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Settings/DeviceTagsPageTests.cs
index b2472a2b3..32563fc6d 100644
--- a/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Settings/DeviceTagsPageTests.cs
+++ b/src/AzureIoTHub.Portal.Server.Tests.Unit/Pages/Settings/DeviceTagsPageTests.cs
@@ -6,7 +6,7 @@ namespace AzureIoTHub.Portal.Server.Tests.Unit.Pages.Settings
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Threading.Tasks;
+    //using System.Threading.Tasks;
     using AutoFixture;
     using AzureIoTHub.Portal.Client.Exceptions;
     using AzureIoTHub.Portal.Client.Models;
@@ -19,6 +19,7 @@ namespace AzureIoTHub.Portal.Server.Tests.Unit.Pages.Settings
     using Moq;
     using MudBlazor;
     using NUnit.Framework;
+    using System.Threading.Tasks;
 
     [TestFixture]
     public class DeviceTagsPageTests : BlazorUnitTest
@@ -125,33 +126,56 @@ public void OnInitializedAsyncShouldProcessProblemDetailsExceptionWhenIssueOccur
 
 
         [Test]
-        public void ClickOnSaveShouldUpdateTagList()
+        public void ClickOnSaveShouldCreateUpdateTag()
         {
-            var expectedTags = new List<DeviceTag>
-            {
-                new() {
-                    Label = "Label",
-                    Name = "Name",
-                    Required = false,
-                    Searchable = false
-                }
-            };
-
+            //Arrange
             _ = this.mockDeviceTagSettingsClientService.Setup(service => service.GetDeviceTags())
-                .ReturnsAsync(expectedTags);
-
-            _ = this.mockDeviceTagSettingsClientService.Setup(service => service.UpdateDeviceTags(It.IsAny<List<DeviceTag>>()))
+                .ReturnsAsync(new List<DeviceTag>
+                {
+                    new()
+                    {
+                        Label = "tagLabel", Name = "tagName", Required = false,
+                        Searchable = false
+                    }
+                });
+            _ = this.mockDeviceTagSettingsClientService.Setup(service => service.CreateOrUpdateDeviceTag(It.IsAny<DeviceTag>()))
                 .Returns(Task.CompletedTask);
 
             _ = this.mockSnackbarService.Setup(c => c.Add(It.IsAny<string>(), Severity.Success, null)).Returns((Snackbar)null);
 
 
             var cut = RenderComponent<DeviceTagsPage>();
-            cut.WaitForAssertion(() => cut.Find("#saveButton"));
             cut.WaitForAssertion(() => cut.Markup.Should().NotContain("Loading..."));
 
             // Act
-            cut.Find("#saveButton").Click();
+            cut.WaitForElement("#saveButton").Click();
+
+            cut.WaitForAssertion(() => MockRepository.VerifyAll());
+        }
+
+        [Test]
+        public void ClickOnDeleteShouldDeleteTag()
+        {
+            //Arrange
+            const string deviceTagName = "tagName";
+
+            _ = this.mockDeviceTagSettingsClientService.Setup(service => service.GetDeviceTags())
+                .ReturnsAsync(new List<DeviceTag>
+                {
+                    new()
+                    {
+                        Label = "tagLabel", Name = deviceTagName, Required = false,
+                        Searchable = false
+                    }
+                });
+            _ = this.mockDeviceTagSettingsClientService.Setup(service => service.DeleteDeviceTagByName(deviceTagName))
+                .Returns(Task.CompletedTask);
+
+            var cut = RenderComponent<DeviceTagsPage>();
+            cut.WaitForAssertion(() => cut.Markup.Should().NotContain("Loading..."));
+
+            // Act
+            cut.WaitForElement("#deleteButton").Click();
 
             cut.WaitForAssertion(() => MockRepository.VerifyAll());
         }
@@ -232,7 +256,7 @@ public void ClickOnSaveShouldProcessProblemDetailsExceptionIfIssueOccursWhenUpda
                     new () { Label = "Label", Name = "Name", Required = false, Searchable = false }
                 });
 
-            _ = this.mockDeviceTagSettingsClientService.Setup(service => service.UpdateDeviceTags(It.IsAny<List<DeviceTag>>()))
+            _ = this.mockDeviceTagSettingsClientService.Setup(service => service.CreateOrUpdateDeviceTag(It.IsAny<DeviceTag>()))
                 .ThrowsAsync(new ProblemDetailsException(new ProblemDetailsWithExceptionDetails()));
 
             // Act
diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Services/DeviceTagSettingsClientServiceTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Services/DeviceTagSettingsClientServiceTests.cs
index a42f2de63..fb55c0e2d 100644
--- a/src/AzureIoTHub.Portal.Server.Tests.Unit/Services/DeviceTagSettingsClientServiceTests.cs
+++ b/src/AzureIoTHub.Portal.Server.Tests.Unit/Services/DeviceTagSettingsClientServiceTests.cs
@@ -3,9 +3,9 @@
 
 namespace AzureIoTHub.Portal.Server.Tests.Unit.Services
 {
-    using System.Collections.Generic;
+    //using System.Collections.Generic;
     using System.Linq;
-    using System.Net;
+    //using System.Net;
     using System.Net.Http;
     using System.Threading.Tasks;
     using AutoFixture;
@@ -49,28 +49,28 @@ public async Task GetDeviceTagsShouldReturnDeviceTags()
             MockHttpClient.VerifyNoOutstandingExpectation();
         }
 
-        [Test]
-        public async Task UpdateDeviceTagsShouldUpdateDeviceTags()
-        {
-            // Arrange
-            var expectedDeviceTags = Fixture.Build<DeviceTag>().CreateMany(3).ToList();
+        //[Test]
+        //public async Task UpdateDeviceTagsShouldUpdateDeviceTags()
+        //{
+        //    // Arrange
+        //    var expectedDeviceTags = Fixture.Build<DeviceTag>().CreateMany(3).ToList();
 
-            _ = MockHttpClient.When(HttpMethod.Post, "/api/settings/device-tags")
-                .With(m =>
-                {
-                    _ = m.Content.Should().BeAssignableTo<ObjectContent<IList<DeviceTag>>>();
-                    var tags = m.Content as ObjectContent<IList<DeviceTag>>;
-                    _ = tags.Value.Should().BeEquivalentTo(expectedDeviceTags);
-                    return true;
-                })
-                .Respond(HttpStatusCode.Created);
+        //    _ = MockHttpClient.When(HttpMethod.Post, "/api/settings/device-tags")
+        //        .With(m =>
+        //        {
+        //            _ = m.Content.Should().BeAssignableTo<ObjectContent<IList<DeviceTag>>>();
+        //            var tags = m.Content as ObjectContent<IList<DeviceTag>>;
+        //            _ = tags.Value.Should().BeEquivalentTo(expectedDeviceTags);
+        //            return true;
+        //        })
+        //        .Respond(HttpStatusCode.Created);
 
-            // Act
-            await this.deviceTagSettingsClientService.UpdateDeviceTags(expectedDeviceTags);
+        //    // Act
+        //    await this.deviceTagSettingsClientService.UpdateDeviceTags(expectedDeviceTags);
 
-            // Assert
-            MockHttpClient.VerifyNoOutstandingRequest();
-            MockHttpClient.VerifyNoOutstandingExpectation();
-        }
+        //    // Assert
+        //    MockHttpClient.VerifyNoOutstandingRequest();
+        //    MockHttpClient.VerifyNoOutstandingExpectation();
+        //}
     }
 }
diff --git a/src/AzureIoTHub.Portal/Client/Pages/Settings/DeviceTagsPage.razor b/src/AzureIoTHub.Portal/Client/Pages/Settings/DeviceTagsPage.razor
index 63001622c..4209f113c 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/Settings/DeviceTagsPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/Settings/DeviceTagsPage.razor
@@ -6,83 +6,87 @@
 @inject IDeviceTagSettingsClientService DeviceTagSettingsClientService
 
 <MudGrid>
-<MudItem xs="12">
-    <MudTable Items=@Tags Loading="isProcessing" Dense=true Hover=true Bordered=true Striped=true>
-
-        <ToolBarContent>
-            <MudText Typo="Typo.h6">Tags</MudText>
-            <MudSpacer />
-            <MudTooltip Text="Refresh list">
-                <MudIconButton id="reload-tags" Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="LoadTags" Class="ma-2"></MudIconButton>
-            </MudTooltip>
-        </ToolBarContent>
-
-        <ColGroup>
-            <col style="width: 40%;" />
-            <col style="width: 40%;" />
-            <col style="width: 5%;" />
-            <col style="width: 5%;" />
-            <col style="width: 10%;" />
-        </ColGroup>
-        <HeaderContent>
-            <MudTh>Name</MudTh>
-            <MudTh>Label</MudTh>
-            <MudTh Style="text-align: center">Required</MudTh>
-            <MudTh Style="text-align: center">Searchable</MudTh>
-            <MudTh Style="text-align: center">Delete</MudTh>
-        </HeaderContent>
-        <RowTemplate Context="TagContexte">
-            <MudTd DataLabel="Name" Style="word-break: break-all;">
-                <MudForm @ref="FormName" Model="TagContexte">
-                    <MudTextField @bind-Value="@TagContexte.Name" Label="Name"
-                                  HelperText="Name that will be registered in the device twin" HelperTextOnFocus="true"
-                                  For="@(() => TagContexte.Name)" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
-                </MudForm>
-            </MudTd>
-            <MudTd DataLabel="Label" Style="word-break: break-all; ">
-                <MudForm @ref="FormLabel" Model="TagContexte">
-                    <MudTextField @bind-Value="@TagContexte.Label" Label="Label"
-                                  HelperText="The label shown to the user" HelperTextOnFocus="true"
-                                  For="@(() => TagContexte.Label)" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
-                </MudForm>
-            </MudTd>
-            <MudTd DataLabel="Required" Style="text-align: center;">
-                <MudCheckBox @bind-Checked="@TagContexte.Required"></MudCheckBox>
-            </MudTd>
-            <MudTd DataLabel="Searchable" Style="text-align: center;">
-                <MudCheckBox @bind-Checked="@TagContexte.Searchable"></MudCheckBox>
-            </MudTd>
-            <MudTd DataLabel="Delete" Style="text-align: center">
-                <MudTooltip Text="Delete device">
-                    <MudIconButton Color="Color.Default" Icon="@Icons.Material.Filled.Delete" Size="Size.Medium" OnClick="@(() => DeleteTag(TagContexte))"></MudIconButton>
+    <MudItem xs="12">
+        <MudTable Items=@Tags Loading="isProcessing" Dense=true Hover=true Bordered=true Striped=true>
+
+            <ToolBarContent>
+                <MudText Typo="Typo.h6">Tags</MudText>
+                <MudSpacer />
+                <MudTooltip Text="Refresh list">
+                    <MudIconButton id="reload-tags" Icon="@Icons.Material.Filled.Refresh" Size="Size.Medium" OnClick="LoadTags" Class="ma-2"></MudIconButton>
                 </MudTooltip>
-            </MudTd>
-        </RowTemplate>
-        <FooterContent>
-            <MudButton StartIcon="@Icons.Material.Filled.Add" Size="Size.Medium" Color="Color.Success" OnClick="AddTag" id="addTagButton">Add a new Tag</MudButton>
-        </FooterContent>
-
-        <NoRecordsContent>
-            <MudText>No matching records found</MudText>
-        </NoRecordsContent>
-        <LoadingContent>
-            <MudText>Loading...</MudText>
-        </LoadingContent>
-    </MudTable>
-    <MudCardActions Class="pb-4 pl-4">
-        <MudButton Variant="Variant.Filled" Color="Color.Primary" Class="ml-auto" OnClick="Save" id="saveButton" Disabled="isProcessing">Save Changes</MudButton>
-    </MudCardActions>
-</MudItem>
+            </ToolBarContent>
+
+            <ColGroup>
+                <col style="width: 40%;" />
+                <col style="width: 40%;" />
+                <col style="width: 5%;" />
+                <col style="width: 5%;" />
+                <col style="width: 5%;" />
+                <col style="width: 5%;" />
+            </ColGroup>
+            <HeaderContent>
+                <MudTh>Name</MudTh>
+                <MudTh>Label</MudTh>
+                <MudTh Style="text-align: center">Required</MudTh>
+                <MudTh Style="text-align: center">Searchable</MudTh>
+                <MudTh Style="text-align: center">Delete</MudTh>
+                <MudTh Style="text-align: center">Validate</MudTh>
+            </HeaderContent>
+            <RowTemplate Context="TagContexte">
+                <MudTd DataLabel="Name" Style="word-break: break-all;">
+                    <MudForm @ref="FormName" Model="TagContexte">
+                        <MudTextField @bind-Value="@TagContexte.Name" Label="Name"
+                                      HelperText="Name that will be registered in the device twin" HelperTextOnFocus="true"
+                                      For="@(() => TagContexte.Name)" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
+                    </MudForm>
+                </MudTd>
+                <MudTd DataLabel="Label" Style="word-break: break-all; ">
+                    <MudForm @ref="FormLabel" Model="TagContexte">
+                        <MudTextField @bind-Value="@TagContexte.Label" Label="Label"
+                                      HelperText="The label shown to the user" HelperTextOnFocus="true"
+                                      For="@(() => TagContexte.Label)" Margin="Margin.Dense" Variant="Variant.Outlined" Required="true"></MudTextField>
+                    </MudForm>
+                </MudTd>
+                <MudTd DataLabel="Required" Style="text-align: center;">
+                    <MudCheckBox @bind-Checked="@TagContexte.Required"></MudCheckBox>
+                </MudTd>
+                <MudTd DataLabel="Searchable" Style="text-align: center;">
+                    <MudCheckBox @bind-Checked="@TagContexte.Searchable"></MudCheckBox>
+                </MudTd>
+                <MudTd DataLabel="Delete" Style="text-align: center">
+                    <MudTooltip Text="Delete device">
+                        <MudIconButton Color="Color.Default" Icon="@Icons.Material.Filled.Delete" Size="Size.Medium" OnClick="@(() => DeleteTag(TagContexte))" id="deleteButton"></MudIconButton>
+                    </MudTooltip>
+                </MudTd>
+                <MudTd DataLabel="Validate" Style="text-align: center;">
+                    <MudTooltip Text="Validate device">
+                        <MudIconButton Color="Color.Default" Icon="@Icons.Filled.CheckCircle" Size="Size.Medium" OnClick="@(() => Save(TagContexte))" id="saveButton" Disabled="isProcessing">Save Changes></MudIconButton>
+                    </MudTooltip>
+                </MudTd>
+            </RowTemplate>
+            <FooterContent>
+                <MudButton StartIcon="@Icons.Material.Filled.Add" Size="Size.Medium" Color="Color.Success" OnClick="AddTag" id="addTagButton">Add a new Tag</MudButton>
+            </FooterContent>
+
+            <NoRecordsContent>
+                <MudText>No matching records found</MudText>
+            </NoRecordsContent>
+            <LoadingContent>
+                <MudText>Loading...</MudText>
+            </LoadingContent>
+        </MudTable>
+    </MudItem>
 </MudGrid>
 
 @code {
     [CascadingParameter]
-    public Error Error {get; set;}
+    public Error Error { get; set; }
 
     List<DeviceTag> Tags { get; set; } = new();
     private MudForm FormName { get; set; }
     private MudForm FormLabel { get; set; }
-
+    
     private bool isProcessing;
 
     protected override async Task OnInitializedAsync()
@@ -120,48 +124,60 @@
 
     private void DeleteTag(DeviceTag item)
     {
-        Tags.Remove(item);
+        try
+        {
+            DeviceTagSettingsClientService.DeleteDeviceTagByName(item.Name);
+            Tags.Remove(item);
+        }
+        catch (ProblemDetailsException exception)
+        {
+            Error?.ProcessProblemDetails(exception);
+        }
     }
 
-    private async Task Save()
+    private async Task Save(DeviceTag deviceTag)
     {
-        isProcessing = true;
+        try
+        {
+            isProcessing = true;
 
-        // Checks empty field and regex validation
-        await FormLabel.Validate();
-        await FormName.Validate();
+            await FormLabel.Validate();
+            await FormName.Validate();
 
-        // Checks duplicate
-        bool duplicated = false;
-        var query = Tags.GroupBy(x => x.Name)
+            // Checks duplicate
+            bool duplicated = false;
+            var query = Tags.GroupBy(x => x.Name)
                         .Where(x => x.Count() > 1)
                         .Select(x => x.Key)
                         .ToList();
-        foreach (var item in query)
-        {
-            Snackbar.Add($"The name '{item}' appears more than once!", Severity.Warning);
-            duplicated = true;
-        }
+            foreach (var item in query)
+            {
+                Snackbar.Add($"The name '{item}' appears more than once!", Severity.Warning);
+                duplicated = true;
+            }
 
-        if (FormLabel.IsValid && FormName.IsValid && !duplicated)
-        {
-            try
+            if (!FormLabel.IsValid || !FormName.IsValid || duplicated)
             {
-                await DeviceTagSettingsClientService.UpdateDeviceTags(Tags);
+                Snackbar.Add("One or more validation errors occurred", Severity.Error);
 
-                // Prompts a snack bar to inform the action was successful
-                Snackbar.Add($"Settings have been successfully updated!", Severity.Success);   
-            }
-            catch (ProblemDetailsException exception)
+                isProcessing = false;
+
+                return;
+            }         
+            else
             {
-                Error?.ProcessProblemDetails(exception);
+                await DeviceTagSettingsClientService.CreateOrUpdateDeviceTag(deviceTag);
             }
+
+            Snackbar.Add($"Settings have been successfully updated!", Severity.Success);
         }
-        else
+        catch (ProblemDetailsException exception)
         {
-            Snackbar.Add("One or more validation errors occurred", Severity.Error);
+            Error?.ProcessProblemDetails(exception);
+        }
+        finally
+        {
+            isProcessing = false;            
         }
-
-        isProcessing = false;
     }
 }
diff --git a/src/AzureIoTHub.Portal/Client/Services/DeviceTagSettingsClientService.cs b/src/AzureIoTHub.Portal/Client/Services/DeviceTagSettingsClientService.cs
index d07bd2225..406156712 100644
--- a/src/AzureIoTHub.Portal/Client/Services/DeviceTagSettingsClientService.cs
+++ b/src/AzureIoTHub.Portal/Client/Services/DeviceTagSettingsClientService.cs
@@ -6,7 +6,9 @@ namespace AzureIoTHub.Portal.Client.Services
     using System.Collections.Generic;
     using System.Net.Http;
     using System.Net.Http.Json;
+    using System.Text;
     using System.Threading.Tasks;
+    using Newtonsoft.Json;
     using Portal.Models.v10;
 
     public class DeviceTagSettingsClientService : IDeviceTagSettingsClientService
@@ -18,14 +20,22 @@ public DeviceTagSettingsClientService(HttpClient http)
             this.http = http;
         }
 
-        public async Task<IList<DeviceTag>> GetDeviceTags()
+        public Task CreateOrUpdateDeviceTag(DeviceTag deviceTag)
         {
-            return await this.http.GetFromJsonAsync<List<DeviceTag>>("api/settings/device-tags");
+            var deviceTagAsJson = JsonConvert.SerializeObject(deviceTag);
+            using var content = new StringContent(deviceTagAsJson, Encoding.UTF8, "application/json");
+            return this.http.PatchAsync("api/settings/device-tags", content);
+        }
+
+        public Task DeleteDeviceTagByName(string deviceTagName)
+        {
+            return this.http.DeleteAsync($"api/settings/device-tags/{deviceTagName}");
         }
 
-        public Task UpdateDeviceTags(IList<DeviceTag> deviceTags)
+        public async Task<IList<DeviceTag>> GetDeviceTags()
         {
-            return this.http.PostAsJsonAsync("api/settings/device-tags", deviceTags);
+            return await this.http.GetFromJsonAsync<List<DeviceTag>>("api/settings/device-tags");
         }
+
     }
 }
diff --git a/src/AzureIoTHub.Portal/Client/Services/IDeviceTagSettingsClientService.cs b/src/AzureIoTHub.Portal/Client/Services/IDeviceTagSettingsClientService.cs
index f27a8962d..b7f0195f4 100644
--- a/src/AzureIoTHub.Portal/Client/Services/IDeviceTagSettingsClientService.cs
+++ b/src/AzureIoTHub.Portal/Client/Services/IDeviceTagSettingsClientService.cs
@@ -11,6 +11,8 @@ public interface IDeviceTagSettingsClientService
     {
         Task<IList<DeviceTag>> GetDeviceTags();
 
-        Task UpdateDeviceTags(IList<DeviceTag> deviceTags);
+        Task CreateOrUpdateDeviceTag(DeviceTag deviceTag);
+
+        Task DeleteDeviceTagByName(string deviceTagName);
     }
 }