1 files changed, 6 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 910eff065d1..7a981cd6a53 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -121,7 +121,12 @@ public class DeployState implements ConfigDefinitionStore {
         this.importedModels = new ImportedMlModels(applicationPackage.getFileReference(ApplicationPackage.MODELS_DIR),
                                                    modelImporters);
 
-        this.validationOverrides = applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml).orElse(ValidationOverrides.empty);
+        this.validationOverrides =
+                zone.environment().isManuallyDeployed()
+                ? ValidationOverrides.all // Don't protect manually deployed zones
+                : applicationPackage.getValidationOverrides().map(ValidationOverrides::fromXml)
+                                    .orElse(ValidationOverrides.empty);
+
         this.wantedNodeVespaVersion = wantedNodeVespaVersion;
         this.now = now;
     }