Only add tombstones to deactivation in manual environments

1 files changed, 2 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index d8abc77ed06..7135cbe77c9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -725,7 +725,8 @@ public class ApplicationController {
             // ok; already gone
         } finally {
             controller.routing().policies().refresh(application.get().id().instance(instanceName), application.get().deploymentSpec(), zone);
-            applicationStore.putMetaTombstone(id, clock.instant());
+            if (zone.environment().isManuallyDeployed())
+                applicationStore.putMetaTombstone(id, clock.instant());
         }
         return application.with(instanceName, instance -> instance.withoutDeploymentIn(zone));
     }