diff --git a/Agent/Services/Linux/UpdaterLinux.cs b/Agent/Services/Linux/UpdaterLinux.cs
index 4a6b2b299..6a84e59e3 100644
--- a/Agent/Services/Linux/UpdaterLinux.cs
+++ b/Agent/Services/Linux/UpdaterLinux.cs
@@ -102,6 +102,11 @@ public async Task CheckForUpdates()
 
             _logger.LogInformation("Service Updater: Update found.");
 
+            if (response.Headers.ETag is { } responseEtag)
+            {
+                await File.WriteAllTextAsync("etag.txt", responseEtag.ToString());
+            }
+
             await InstallLatestVersion();
 
         }
diff --git a/Agent/Services/MacOS/UpdaterMac.cs b/Agent/Services/MacOS/UpdaterMac.cs
index 9d1d1b0d8..8bf2b6da3 100644
--- a/Agent/Services/MacOS/UpdaterMac.cs
+++ b/Agent/Services/MacOS/UpdaterMac.cs
@@ -100,6 +100,11 @@ public async Task CheckForUpdates()
 
             _logger.LogInformation("Service Updater: Update found.");
 
+            if (response.Headers.ETag is { } responseEtag)
+            {
+                await File.WriteAllTextAsync("etag.txt", responseEtag.ToString());
+            }
+
             await InstallLatestVersion();
 
         }
diff --git a/Agent/Services/Windows/UpdaterWin.cs b/Agent/Services/Windows/UpdaterWin.cs
index 3d76bec47..48ada8039 100644
--- a/Agent/Services/Windows/UpdaterWin.cs
+++ b/Agent/Services/Windows/UpdaterWin.cs
@@ -96,9 +96,13 @@ public async Task CheckForUpdates()
                 return;
             }
 
-
             _logger.LogInformation("Service Updater: Update found.");
 
+            if (response.Headers.ETag is { } responseEtag)
+            {
+                await File.WriteAllTextAsync("etag.txt", responseEtag.ToString());
+            }
+
             await InstallLatestVersion();
 
         }
diff --git a/Server/Components/Devices/DeviceCard.razor b/Server/Components/Devices/DeviceCard.razor
index c4a18746b..8c2fa7c4d 100644
--- a/Server/Components/Devices/DeviceCard.razor
+++ b/Server/Components/Devices/DeviceCard.razor
@@ -113,6 +113,12 @@
                                 </ButtonContent>
                             </FileInputButton>
                         </li>
+                        <li>
+                            <button class="dropdown-item" @onclick="UpdateAgent" disabled="@(!Device.IsOnline)">
+                                <i class="oi oi-cloud-download" title="Update Agent"></i>
+                                <span class="ms-2">Update Agent</span>
+                            </button>
+                        </li>
                         <li>
                             <button class="dropdown-item bg-danger" @onclick="UninstallAgent">
                                 <i class="oi oi-delete" title="Uninstall"></i>
diff --git a/Server/Components/Devices/DeviceCard.razor.cs b/Server/Components/Devices/DeviceCard.razor.cs
index 58a46c521..0b55b755b 100644
--- a/Server/Components/Devices/DeviceCard.razor.cs
+++ b/Server/Components/Devices/DeviceCard.razor.cs
@@ -354,6 +354,12 @@ private void ToggleIsSelected(ChangeEventArgs args)
         }
     }
 
+    private async Task UpdateAgent()
+    {
+        await CircuitConnection.UpdateAgents(new[] { Device.ID });
+        ToastService.ShowToast("Update command sent.");
+    }
+
     private async Task UninstallAgent()
     {
         var result = await JsInterop.Confirm("Are you sure you want to uninstall this agent?  This is permanent!");
diff --git a/Server/Hubs/CircuitConnection.cs b/Server/Hubs/CircuitConnection.cs
index 8a4ba714a..5af209bde 100644
--- a/Server/Hubs/CircuitConnection.cs
+++ b/Server/Hubs/CircuitConnection.cs
@@ -31,6 +31,8 @@ public interface ICircuitConnection
 
     Task ReinstallAgents(string[] deviceIDs);
 
+    Task UpdateAgents(string[] deviceIDs);
+
     Task<Result<RemoteControlSession>> RemoteControl(string deviceID, bool viewOnly);
 
     Task RemoveDevices(string[] deviceIDs);
@@ -215,6 +217,13 @@ public async Task ReinstallAgents(string[] deviceIDs)
         _dataService.RemoveDevices(deviceIDs);
     }
 
+    public async Task UpdateAgents(string[] deviceIDs)
+    {
+        deviceIDs = _dataService.FilterDeviceIdsByUserPermission(deviceIDs, User);
+        var connections = GetActiveConnectionsForUserOrg(deviceIDs);
+        await _agentHubContext.Clients.Clients(connections).ReinstallAgent();
+    }
+
     public async Task<Result<RemoteControlSession>> RemoteControl(string deviceId, bool viewOnly)
     {
         var settings = await _dataService.GetSettings();