diff --git a/src/ScadaLink.CentralUI/Components/Pages/Deployment/Instances.razor b/src/ScadaLink.CentralUI/Components/Pages/Deployment/Instances.razor
index 21c14d95..7e175afd 100644
--- a/src/ScadaLink.CentralUI/Components/Pages/Deployment/Instances.razor
+++ b/src/ScadaLink.CentralUI/Components/Pages/Deployment/Instances.razor
@@ -165,6 +165,9 @@
                             }
                         </td>
                         <td>
+                            <button class="btn btn-outline-primary btn-sm py-0 px-1 me-1"
+                                    @onclick="() => DeployInstance(inst)" disabled="@_actionInProgress"
+                                    title="Flatten template and send config to site">@(isStale ? "Redeploy" : "Deploy")</button>
                             @if (inst.State == InstanceState.Enabled)
                             {
                                 <button class="btn btn-outline-warning btn-sm py-0 px-1 me-1"
@@ -383,6 +386,30 @@
         _actionInProgress = false;
     }
 
+    private async Task DeployInstance(Instance inst)
+    {
+        _actionInProgress = true;
+        try
+        {
+            var user = "system";
+            var result = await DeploymentService.DeployInstanceAsync(inst.Id, user);
+            if (result.IsSuccess)
+            {
+                _toast.ShowSuccess($"Instance '{inst.UniqueName}' deployed (revision {result.Value.RevisionHash?[..8]}).");
+                await LoadDataAsync();
+            }
+            else
+            {
+                _toast.ShowError($"Deploy failed: {result.Error}");
+            }
+        }
+        catch (Exception ex)
+        {
+            _toast.ShowError($"Deploy failed: {ex.Message}");
+        }
+        _actionInProgress = false;
+    }
+
     private async Task DeleteInstance(Instance inst)
     {
         var confirmed = await _confirmDialog.ShowAsync(
diff --git a/src/ScadaLink.SiteRuntime/Actors/DeploymentManagerActor.cs b/src/ScadaLink.SiteRuntime/Actors/DeploymentManagerActor.cs
index b201c848..d7f5c31d 100644
--- a/src/ScadaLink.SiteRuntime/Actors/DeploymentManagerActor.cs
+++ b/src/ScadaLink.SiteRuntime/Actors/DeploymentManagerActor.cs
@@ -180,9 +180,14 @@ public class DeploymentManagerActor : ReceiveActor, IWithTimers
         {
             Context.Stop(existing);
             _instanceActors.Remove(instanceName);
+            // Wait for the child to be removed from the children collection
+            // by yielding and retrying — Context.Stop is processed before the next message
+            Context.System.Scheduler.ScheduleTellOnce(
+                TimeSpan.FromMilliseconds(500), Self, command, Sender);
+            return;
         }
 
-        // Create the Instance Actor immediately
+        // Create the Instance Actor immediately (no existing actor to replace)
         CreateInstanceActor(instanceName, command.FlattenedConfigurationJson);
 
         // Persist to SQLite and clear static overrides asynchronously