Always pass wanted Vespa version

46 files changed, 266 insertions, 181 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index 9b9869a5a3c..cd8ca30f36d 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -36,7 +36,10 @@ public interface ModelContext {
     @Deprecated
     default Optional<com.yahoo.config.provision.Version> vespaVersion() { return Optional.empty(); }
     
+    /** The Vespa version this model is built for */
     Version modelVespaVersion();
+    
+    /** The Vespa version we want nodes to become */
     Version wantedNodeVespaVersion();
 
     interface Properties {
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
index c734e5a9c42..ccf300aedbd 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployProperties.java
@@ -51,6 +51,7 @@ public class DeployProperties {
         return hostedVespa;
     }
 
+    /** Returns the config model version this is building */
     public Version vespaVersion() {
         return vespaVersion;
     }
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 968e690fac3..14f42a56bc3 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
@@ -1,6 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.deploy;
 
+import com.yahoo.component.Version;
+import com.yahoo.component.Vtag;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.application.api.FileRegistry;
@@ -47,7 +49,7 @@ import java.util.Set;
 import java.util.logging.Logger;
 
 /**
- * Contains various state during deploy that should be reachable to all builders of a {@link com.yahoo.config.model.ConfigModel}
+ * Contains various state during deploy that should be available in all builders of a {@link com.yahoo.config.model.ConfigModel}
  *
  * @author lulf
  * @since 5.8
@@ -68,6 +70,7 @@ public class DeployState implements ConfigDefinitionStore {
     private final QueryProfiles queryProfiles;
     private final SemanticRules semanticRules;
     private final ValidationOverrides validationOverrides;
+    private final Version wantedNodeVespaVersion;
 
     private final HostProvisioner provisioner;
 
@@ -83,18 +86,14 @@ public class DeployState implements ConfigDefinitionStore {
                         FileRegistry fileRegistry, DeployLogger deployLogger, Optional<HostProvisioner> hostProvisioner, DeployProperties properties,
                         Optional<ApplicationPackage> permanentApplicationPackage, Optional<ConfigDefinitionRepo> configDefinitionRepo,
                         java.util.Optional<Model> previousModel, Set<Rotation> rotations, Zone zone, QueryProfiles queryProfiles, 
-                        SemanticRules semanticRules, Instant now) {
+                        SemanticRules semanticRules, Instant now, Version wantedNodeVespaVersion) {
         this.logger = deployLogger;
         this.fileRegistry = fileRegistry;
         this.rankProfileRegistry = rankProfileRegistry;
         this.applicationPackage = applicationPackage;
         this.properties = properties;
         this.previousModel = previousModel;
-        if (hostProvisioner.isPresent()) {
-            this.provisioner = hostProvisioner.get();
-        } else {
-            this.provisioner = getDefaultModelHostProvisioner(applicationPackage);
-        }
+        this.provisioner = hostProvisioner.orElse(getDefaultModelHostProvisioner(applicationPackage));
         this.searchDefinitions = searchDocumentModel.getSearchDefinitions();
         this.documentModel = searchDocumentModel.getDocumentModel();
         this.permanentApplicationPackage = permanentApplicationPackage;
@@ -104,7 +103,7 @@ public class DeployState implements ConfigDefinitionStore {
         this.queryProfiles = queryProfiles; // TODO: Remove this by seeing how pagetemplates are propagated
         this.semanticRules = semanticRules; // TODO: Remove this by seeing how pagetemplates are propagated
         this.validationOverrides = new ValidationOverridesXMLReader().read(applicationPackage.getValidationOverrides(), now);
-
+        this.wantedNodeVespaVersion = wantedNodeVespaVersion;
     }
 
     public static HostProvisioner getDefaultModelHostProvisioner(ApplicationPackage applicationPackage) {
@@ -212,6 +211,8 @@ public class DeployState implements ConfigDefinitionStore {
     public QueryProfiles getQueryProfiles() { return queryProfiles; }
 
     public SemanticRules getSemanticRules() { return semanticRules; }
+    
+    public Version getWantedNodeVespaVersion() { return wantedNodeVespaVersion; }
 
     public static class Builder {
 
@@ -226,6 +227,7 @@ public class DeployState implements ConfigDefinitionStore {
         private Set<Rotation> rotations = new HashSet<>();
         private Zone zone = Zone.defaultZone();
         private Instant now = Instant.now();
+        private Version wantedNodeVespaVersion = Vtag.currentVersion;
 
         public Builder applicationPackage(ApplicationPackage applicationPackage) {
             this.applicationPackage = applicationPackage;
@@ -281,6 +283,11 @@ public class DeployState implements ConfigDefinitionStore {
             this.now = now;
             return this;
         }
+        
+        public Builder wantedNodeVespaVersion(Version version) {
+            this.wantedNodeVespaVersion = version;
+            return this;
+        }
 
         public DeployState build() {
             RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
@@ -288,7 +295,7 @@ public class DeployState implements ConfigDefinitionStore {
             SemanticRules semanticRules = new SemanticRuleBuilder().build(applicationPackage);
             SearchDocumentModel searchDocumentModel = createSearchDocumentModel(rankProfileRegistry, logger, queryProfiles);
             return new DeployState(applicationPackage, searchDocumentModel, rankProfileRegistry, fileRegistry, logger, hostProvisioner,
-                                   properties, permanentApplicationPackage, configDefinitionRepo, previousModel, rotations, zone, queryProfiles, semanticRules, now);
+                                   properties, permanentApplicationPackage, configDefinitionRepo, previousModel, rotations, zone, queryProfiles, semanticRules, now, wantedNodeVespaVersion);
         }
 
         private SearchDocumentModel createSearchDocumentModel(RankProfileRegistry rankProfileRegistry, DeployLogger logger, QueryProfiles queryProfiles) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
index 8e384b6e875..36071c4387e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java
@@ -70,6 +70,7 @@ public class VespaModelFactory implements ModelFactory {
         this.clock = clock;
     }
 
+    /** Returns the version this model is build for */
     @Override
     public Version getVersion() {
         return Version.fromIntValues(VespaVersion.major, VespaVersion.minor, VespaVersion.micro);
@@ -129,7 +130,8 @@ public class VespaModelFactory implements ModelFactory {
             .modelHostProvisioner(createHostProvisioner(modelContext))
             .rotations(modelContext.properties().rotations())
             .zone(zone)
-            .now(clock.instant());
+            .now(clock.instant())
+            .wantedNodeVespaVersion(modelContext.wantedNodeVespaVersion());
         modelContext.previousModel().ifPresent(builder::previousModel);
         return builder.build();
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
index 0a433cbc122..260d8f72270 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java
@@ -63,21 +63,21 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu
     }
 
     @Override
-    protected Admin doBuild(AbstractConfigProducer parent, Element adminE) {
-        Yamas yamas = getYamas(XML.getChild(adminE, "yamas"));
+    protected Admin doBuild(AbstractConfigProducer parent, Element adminElement) {
+        Yamas yamas = getYamas(XML.getChild(adminElement, "yamas"));
 
         Metrics metrics = new MetricsBuilder(applicationType, predefinedMetricSets)
-                .buildMetrics(XML.getChild(adminE, "metrics"));
+                .buildMetrics(XML.getChild(adminElement, "metrics"));
         Map<String, MetricsConsumer> legacyMetricsConsumers = DomMetricBuilderHelper
-                .buildMetricsConsumers(XML.getChild(adminE, "metric-consumers"));
+                .buildMetricsConsumers(XML.getChild(adminElement, "metric-consumers"));
 
         Admin admin = new Admin(parent, yamas, metrics, legacyMetricsConsumers, multitenant);
 
-        doBuildAdmin(admin, adminE);
+        doBuildAdmin(admin, adminElement);
 
         new ModelConfigProvider(admin);
 
-        FileDistributionOptions fileDistributionOptions = new DomFileDistributionOptionsBuilder().build(XML.getChild(adminE, "filedistribution"));
+        FileDistributionOptions fileDistributionOptions = new DomFileDistributionOptionsBuilder().build(XML.getChild(adminElement, "filedistribution"));
         admin.setFileDistribution(new FileDistributionConfigProducer.Builder(fileDistributionOptions).build(parent, fileRegistry));
         return admin;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index 760fe246fc5..08843d306b7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.builder.xml.dom;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.model.api.ConfigServerSpec;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.application.api.DeployLogger;
@@ -28,25 +29,29 @@ import java.util.Optional;
 public class DomAdminV4Builder extends DomAdminBuilderBase {
 
     private final Collection<ContainerModel> containerModels;
-    private final DeployLogger deployLogger;
+    private final ConfigModelContext context;
 
-    public DomAdminV4Builder(ConfigModelContext modelContext, boolean multitenant, List<ConfigServerSpec> configServerSpecs, Collection<ContainerModel> containerModels) {
-        super(modelContext.getApplicationType(), modelContext.getDeployState().getFileRegistry(), multitenant, configServerSpecs);
+    public DomAdminV4Builder(ConfigModelContext context, boolean multitenant, List<ConfigServerSpec> configServerSpecs, Collection<ContainerModel> containerModels) {
+        super(context.getApplicationType(), context.getDeployState().getFileRegistry(), multitenant, configServerSpecs);
         this.containerModels = containerModels;
-        this.deployLogger = modelContext.getDeployLogger();
+        this.context = context;
     }
 
     @Override
     protected void doBuildAdmin(Admin admin, Element w3cAdminElement) {
         ModelElement adminElement = new ModelElement(w3cAdminElement);
         admin.addConfigservers(getConfigServersFromSpec(admin));
-
+        Version version = context.getDeployState().getWantedNodeVespaVersion();
+        
         // Note: These two elements only exists in admin version 4.0
         // This build handles admin version 3.0 by ignoring its content (as the content is not useful)
-        Optional<NodesSpecification> requestedSlobroks   = NodesSpecification.optionalDedicatedFromParent(adminElement.getChild("slobroks"));
-        Optional<NodesSpecification> requestedLogservers = NodesSpecification.optionalDedicatedFromParent(adminElement.getChild("logservers"));
-        assignSlobroks(requestedSlobroks.orElse(NodesSpecification.nonDedicated(3)), admin);
-        assignLogserver(requestedLogservers.orElse(NodesSpecification.nonDedicated(1)), admin);
+        Optional<NodesSpecification> requestedSlobroks = 
+                NodesSpecification.optionalDedicatedFromParent(adminElement.getChild("slobroks"), version);
+        Optional<NodesSpecification> requestedLogservers = 
+                NodesSpecification.optionalDedicatedFromParent(adminElement.getChild("logservers"), version);
+
+        assignSlobroks(requestedSlobroks.orElse(NodesSpecification.nonDedicated(3, version)), admin);
+        assignLogserver(requestedLogservers.orElse(NodesSpecification.nonDedicated(1, version)), admin);
     }
 
     private void assignSlobroks(NodesSpecification nodesSpecification, Admin admin) {
@@ -71,7 +76,10 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
     }
 
     private Collection<HostResource> allocateHosts(HostSystem hostSystem, String clusterId, NodesSpecification nodesSpecification) {
-        return nodesSpecification.provision(hostSystem, ClusterSpec.Type.admin, ClusterSpec.Id.from(clusterId), deployLogger).keySet();
+        return nodesSpecification.provision(hostSystem, 
+                                            ClusterSpec.Type.admin, 
+                                            ClusterSpec.Id.from(clusterId), 
+                                            context.getDeployLogger()).keySet();
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
index c29990b02e6..eeb6d286da4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
@@ -111,7 +111,7 @@ public class NodesSpecification {
     public int groups() { return groups; }
 
     public Map<HostResource, ClusterMembership> provision(HostSystem hostSystem, ClusterSpec.Type clusterType, ClusterSpec.Id clusterId, DeployLogger logger) {
-        ClusterSpec cluster = ClusterSpec.request(clusterType, clusterId, version, dockerImage);
+        ClusterSpec cluster = ClusterSpec.request(clusterType, clusterId, version);
         return hostSystem.allocateHosts(cluster, Capacity.fromNodeCount(count, flavor, required), groups, logger);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index c39b3247be1..32811fdcb78 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -400,9 +400,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     
     private List<Container> createNodes(ContainerCluster cluster, Element nodesElement, ConfigModelContext context) {
         if (nodesElement.hasAttribute("count")) // regular, hosted node spec
-            return createNodesFromNodeCount(cluster, nodesElement);
+            return createNodesFromNodeCount(cluster, nodesElement, context);
         else if (nodesElement.hasAttribute("type")) // internal use for hosted system infrastructure nodes
-            return createNodesFromNodeType(cluster, nodesElement);
+            return createNodesFromNodeType(cluster, nodesElement, context);
         else if (nodesElement.hasAttribute("of")) // hosted node spec referencing a content cluster
             return createNodesFromContentServiceReference(cluster, nodesElement, context);
         else // the non-hosted option
@@ -448,7 +448,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
                 return singleContentHost.get();
             }
             else { // request 1 node
-                ClusterSpec clusterSpec = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from(cluster.getName()), Optional.empty());
+                ClusterSpec clusterSpec = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from(cluster.getName()), context.getDeployState().getWantedNodeVespaVersion());
                 return cluster.getHostSystem().allocateHosts(clusterSpec, Capacity.fromNodeCount(1), 1, logger).keySet().iterator().next();
             }
         } else {
@@ -456,8 +456,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         }
     }
 
-    private List<Container> createNodesFromNodeCount(ContainerCluster cluster, Element nodesElement) {
-        NodesSpecification nodesSpecification = NodesSpecification.from(new ModelElement(nodesElement));
+    private List<Container> createNodesFromNodeCount(ContainerCluster cluster, Element nodesElement, ConfigModelContext context) {
+        NodesSpecification nodesSpecification = NodesSpecification.from(new ModelElement(nodesElement), 
+                                                                        context.getDeployState().getWantedNodeVespaVersion());
         Map<HostResource, ClusterMembership> hosts = nodesSpecification.provision(cluster.getRoot().getHostSystem(),
                                                                                   ClusterSpec.Type.container,
                                                                                   ClusterSpec.Id.from(cluster.getName()), 
@@ -465,11 +466,11 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         return createNodesFromHosts(hosts, cluster);
     }
 
-    private List<Container> createNodesFromNodeType(ContainerCluster cluster, Element nodesElement) {
+    private List<Container> createNodesFromNodeType(ContainerCluster cluster, Element nodesElement, ConfigModelContext context) {
         NodeType type = NodeType.valueOf(nodesElement.getAttribute("type"));
         ClusterSpec clusterSpec = ClusterSpec.request(ClusterSpec.Type.container, 
                                                       ClusterSpec.Id.from(cluster.getName()), 
-                                                      Optional.empty());
+                                                      context.getDeployState().getWantedNodeVespaVersion());
         Map<HostResource, ClusterMembership> hosts = 
                 cluster.getRoot().getHostSystem().allocateHosts(clusterSpec, 
                                                                 Capacity.fromRequiredNodeType(type), 1, log);
@@ -492,7 +493,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         cluster.setHostClusterId(referenceId);
 
         Map<HostResource, ClusterMembership> hosts = 
-                StorageGroup.provisionHosts(NodesSpecification.from(new ModelElement(referencedNodesElement)), 
+                StorageGroup.provisionHosts(NodesSpecification.from(new ModelElement(referencedNodesElement), 
+                                                                    context.getDeployState().getWantedNodeVespaVersion()), 
                                             referenceId, 
                                             cluster.getRoot().getHostSystem(),
                                             context.getDeployLogger());
@@ -514,9 +516,9 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         
         NodesSpecification nodesSpec;
         if (contentNodesElementOrNull == null)
-            nodesSpec = NodesSpecification.nonDedicated(1);
+            nodesSpec = NodesSpecification.nonDedicated(1, context.getDeployState().getWantedNodeVespaVersion());
         else
-            nodesSpec = NodesSpecification.from(new ModelElement(contentNodesElementOrNull));
+            nodesSpec = NodesSpecification.from(new ModelElement(contentNodesElementOrNull), context.getDeployState().getWantedNodeVespaVersion());
 
         Map<HostResource, ClusterMembership> hosts =
                 StorageGroup.provisionHosts(nodesSpec,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
index 7625374b0a0..681dba789ca 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
@@ -215,7 +215,7 @@ public class Content extends ConfigModel {
         @Override
         public void doBuild(Content content, Element xml, ConfigModelContext modelContext) {
             Admin admin = content.adminModel != null ? content.adminModel.getAdmin() : null; // This is null in tests only
-            content.cluster = new ContentCluster.Builder(admin, modelContext.getDeployLogger()).build(content.containers, modelContext.getParentProducer(), xml);
+            content.cluster = new ContentCluster.Builder(admin).build(content.containers, modelContext, xml);
             buildIndexingClusters(content, modelContext,
                                   (ApplicationConfigProducerRoot)modelContext.getParentProducer());
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
index 2b23939d8ed..8e065b7d73d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
+import com.yahoo.config.model.ConfigModelContext;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.application.api.DeployLogger;
@@ -189,12 +190,12 @@ public class StorageGroup {
 
         private final ModelElement clusterElement;
         private final ContentCluster owner;
-        private final DeployLogger deployLogger;
+        private final ConfigModelContext context;
 
-        public Builder(ModelElement clusterElement, ContentCluster owner, DeployLogger deployLogger) {
+        public Builder(ModelElement clusterElement, ContentCluster owner, ConfigModelContext context) {
             this.clusterElement = clusterElement;
             this.owner = owner;
-            this.deployLogger = deployLogger;
+            this.context = context;
         }
 
         public StorageGroup buildRootGroup() {
@@ -404,13 +405,13 @@ public class StorageGroup {
 
             Optional<NodesSpecification> nodeRequirement;
             if (nodesElement.isPresent() && nodesElement.get().getStringAttribute("count") != null ) // request these nodes
-                nodeRequirement = Optional.of(NodesSpecification.from(nodesElement.get()));
+                nodeRequirement = Optional.of(NodesSpecification.from(nodesElement.get(), context.getDeployState().getWantedNodeVespaVersion()));
             else if (! nodesElement.isPresent() && subGroups.isEmpty() && owner.getRoot().getDeployState().isHosted()) // request one node
-                nodeRequirement = Optional.of(NodesSpecification.nonDedicated(1));
+                nodeRequirement = Optional.of(NodesSpecification.nonDedicated(1, context.getDeployState().getWantedNodeVespaVersion()));
             else // Nodes or groups explicitly listed, and/opr not hosted - resolve in GroupBuilder
                 nodeRequirement = Optional.empty();
 
-            return new GroupBuilder(group, subGroups, explicitNodes, nodeRequirement, deployLogger);
+            return new GroupBuilder(group, subGroups, explicitNodes, nodeRequirement, context.getDeployLogger());
         }
 
         private Optional<String> childAsString(Optional<ModelElement> element, String childTagName) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index bb1d8d37d60..ca8af6ce18d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -3,6 +3,8 @@ package com.yahoo.vespa.model.content.cluster;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Sets;
+import com.yahoo.config.model.ConfigModelContext;
+import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.config.model.producer.AbstractConfigProducerRoot;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.application.api.DeployLogger;
@@ -88,35 +90,32 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
 
         /** The admin model of this system or null if none (which only happens in tests) */
         private final Admin admin;
-        private final DeployLogger deployLogger;
 
-        public Builder(Admin admin, DeployLogger deployLogger) {
+        public Builder(Admin admin) {
             this.admin = admin;
-            this.deployLogger = deployLogger;
         }
         
-        public ContentCluster build(Collection<ContainerModel> containers, 
-                                    AbstractConfigProducer ancestor, Element w3cContentElement) {
+        public ContentCluster build(Collection<ContainerModel> containers, ConfigModelContext context, Element w3cContentElement) {
 
             ModelElement contentElement = new ModelElement(w3cContentElement);
 
             ModelElement documentsElement = contentElement.getChild("documents");
             Map<String, NewDocumentType> documentDefinitions =
-                    new SearchDefinitionBuilder().build(ancestor.getRoot().getDeployState().getDocumentModel().getDocumentManager(), documentsElement);
+                    new SearchDefinitionBuilder().build(context.getParentProducer().getRoot().getDeployState().getDocumentModel().getDocumentManager(), documentsElement);
 
             String routingSelection = new DocumentSelectionBuilder().build(documentsElement);
             Redundancy redundancy = new RedundancyBuilder().build(contentElement);
             Set<NewDocumentType> globallyDistributedDocuments = new GlobalDistributionBuilder(documentDefinitions).build(documentsElement);
 
-            ContentCluster c = new ContentCluster(ancestor, getClusterName(contentElement), documentDefinitions, 
+            ContentCluster c = new ContentCluster(context.getParentProducer(), getClusterName(contentElement), documentDefinitions, 
                                                   globallyDistributedDocuments, routingSelection, redundancy,
-                                                  ancestor.getRoot().getDeployState().getProperties().zone());
+                                                  context.getParentProducer().getRoot().getDeployState().getProperties().zone());
             c.clusterControllerConfig = new ClusterControllerConfig.Builder(getClusterName(contentElement), contentElement).build(c, contentElement.getXml());
             c.search = new ContentSearchCluster.Builder(documentDefinitions, globallyDistributedDocuments).build(c, contentElement.getXml());
             c.persistenceFactory = new EngineFactoryBuilder().build(contentElement, c);
             c.storageNodes = new StorageCluster.Builder().build(c, w3cContentElement);
             c.distributorNodes = new DistributorCluster.Builder(c).build(c, w3cContentElement);
-            c.rootGroup = new StorageGroup.Builder(contentElement, c, deployLogger).buildRootGroup();
+            c.rootGroup = new StorageGroup.Builder(contentElement, c, context).buildRootGroup();
             validateThatGroupSiblingsAreUnique(c.clusterName, c.rootGroup);
             redundancy.setExplicitGroups(c.getRootGroup().getNumberOfLeafGroups());
             c.search.handleRedundancy(redundancy);
@@ -144,10 +143,9 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
                 setupTuning(c, tuning);
             }
 
-            AbstractConfigProducerRoot root = ancestor.getRoot();
-            if (root == null) return c;
+            if (context.getParentProducer().getRoot() == null) return c;
 
-            addClusterControllers(containers, root, c.rootGroup, contentElement, c.clusterName, c);
+            addClusterControllers(containers, context, c.rootGroup, contentElement, c.clusterName, c);
             return c;
         }
 
@@ -263,7 +261,7 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
             }
         }
 
-        private void addClusterControllers(Collection<ContainerModel> containers, AbstractConfigProducerRoot root, 
+        private void addClusterControllers(Collection<ContainerModel> containers, ConfigModelContext context, 
                                            StorageGroup rootGroup, ModelElement contentElement, 
                                            String contentClusterName, ContentCluster contentCluster) {
             if (admin == null) return; // only in tests
@@ -271,7 +269,7 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
 
             ContainerCluster clusterControllers;
 
-            ContentCluster overlappingCluster = findOverlappingCluster(root, contentCluster);
+            ContentCluster overlappingCluster = findOverlappingCluster(context.getParentProducer().getRoot(), contentCluster);
             if (overlappingCluster != null && overlappingCluster.getClusterControllers() != null) {
                 // Borrow the cluster controllers of the other cluster in this case.
                 // This condition only obtains on non-hosted systems with a shared config server,
@@ -281,9 +279,10 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
             else if (admin.multitenant()) {
                 String clusterName = contentClusterName + "-controllers";
                 NodesSpecification nodesSpecification =
-                    NodesSpecification.optionalDedicatedFromParent(contentElement.getChild("controllers")).orElse(NodesSpecification.nonDedicated(3));
+                    NodesSpecification.optionalDedicatedFromParent(contentElement.getChild("controllers"), context.getDeployState().getWantedNodeVespaVersion())
+                                      .orElse(NodesSpecification.nonDedicated(3, context.getDeployState().getWantedNodeVespaVersion()));
                 Collection<HostResource> hosts = nodesSpecification.isDedicated() ?
-                                                 getControllerHosts(nodesSpecification, admin, clusterName) :
+                                                 getControllerHosts(nodesSpecification, admin, clusterName, context) :
                                                  drawControllerHosts(nodesSpecification.count(), rootGroup, containers);
 
                 clusterControllers = createClusterControllers(new ClusterControllerCluster(contentCluster, "standalone"), hosts, clusterName, true);
@@ -319,8 +318,8 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri
             return ! Sets.intersection(c1Hosts, c2Hosts).isEmpty();
         }
 
-        private Collection<HostResource> getControllerHosts(NodesSpecification nodesSpecification, Admin admin, String clusterName) {
-            return nodesSpecification.provision(admin.getHostSystem(), ClusterSpec.Type.admin, ClusterSpec.Id.from(clusterName), deployLogger).keySet();
+        private Collection<HostResource> getControllerHosts(NodesSpecification nodesSpecification, Admin admin, String clusterName, ConfigModelContext context) {
+            return nodesSpecification.provision(admin.getHostSystem(), ClusterSpec.Type.admin, ClusterSpec.Id.from(clusterName), context.getDeployLogger()).keySet();
         }
 
         private List<HostResource> drawControllerHosts(int count, StorageGroup rootGroup, Collection<ContainerModel> containers) {
diff --git a/config-model/src/test/java/com/yahoo/config/model/MapConfigModelRegistryTest.java b/config-model/src/test/java/com/yahoo/config/model/MapConfigModelRegistryTest.java
index ea32feff8a9..8edde5e3d22 100644
--- a/config-model/src/test/java/com/yahoo/config/model/MapConfigModelRegistryTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/MapConfigModelRegistryTest.java
@@ -8,6 +8,7 @@ import org.w3c.dom.Element;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import static org.junit.Assert.*;
@@ -47,7 +48,7 @@ public class MapConfigModelRegistryTest {
         }
 
         @Override
-        public List<ConfigModelId> handlesElements() { return Arrays.asList(ConfigModelId.fromName("modelB")); }
+        public List<ConfigModelId> handlesElements() { return Collections.singletonList(ConfigModelId.fromName("modelB")); }
         @Override
         public void doBuild(ModelB model, Element spec, ConfigModelContext modelContext) { }
     }
@@ -57,7 +58,7 @@ public class MapConfigModelRegistryTest {
             super(ModelB.class);
         }
         @Override
-        public List<ConfigModelId> handlesElements() { return Arrays.asList(ConfigModelId.fromName("modelB")); }
+        public List<ConfigModelId> handlesElements() { return Collections.singletonList(ConfigModelId.fromName("modelB")); }
         @Override
         public void doBuild(ModelB model, Element spec, ConfigModelContext modelContext) { }
     }
@@ -73,7 +74,7 @@ public class MapConfigModelRegistryTest {
             super(ModelA.class);
         }
         @Override
-        public List<ConfigModelId> handlesElements() { return Arrays.asList(ConfigModelId.fromName("modelA")); }
+        public List<ConfigModelId> handlesElements() { return Collections.singletonList(ConfigModelId.fromName("modelA")); }
 
         @Override
         public void doBuild(ModelA model, Element spec, ConfigModelContext modelContext) { }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java
index 09899f4796f..97cbb7b1f37 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AttributeListTestCase.java
@@ -20,9 +20,9 @@ import static org.junit.Assert.assertTrue;
  * @author bratseth
  */
 public class AttributeListTestCase extends SearchDefinitionTestCase {
+
     @Test
     public void testDeriving() throws IOException, ParseException {
-
         // Test attribute importing
         Search search = SearchBuilder.buildFromFile("src/test/examples/simple.sd");
 
@@ -66,6 +66,6 @@ public class AttributeListTestCase extends SearchDefinitionTestCase {
         assertEquals(Attribute.CollectionType.SINGLE, attribute.getCollectionType());
 
         assertTrue(!attributes.hasNext());
-
     }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java
index 6220ab9f7d5..f2c1286ce34 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java
@@ -21,13 +21,14 @@ import static org.junit.Assert.assertNull;
  * @author  bratseth
  */
 public class SummaryTestCase extends SearchDefinitionTestCase {
+
     @Test
     public void testDeriving() throws IOException, ParseException {
         Search search = SearchBuilder.buildFromFile("src/test/examples/simple.sd");
         SummaryClass summary=new SummaryClass(search,search.getSummary("default"), new BaseDeployLogger());
         assertEquals("default",summary.getName());
 
-        Iterator fields=summary.fieldIterator();
+        Iterator<SummaryClassField> fields=summary.fieldIterator();
 
         SummaryClassField field;
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
index 16c63bc5251..cc7a38a828d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.ClusterSpec;
@@ -143,7 +144,7 @@ public class HostResourceTest {
     }
 
     private static ClusterSpec clusterSpec(ClusterSpec.Type type, String id) {
-        return ClusterSpec.from(type, ClusterSpec.Id.from(id), ClusterSpec.Group.from(0), Optional.empty());
+        return ClusterSpec.from(type, ClusterSpec.Id.from(id), ClusterSpec.Group.from(0), Version.fromString("6.42"));
     }
 
     private HostResource mockHostResource() {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
index 8671f44ad6a..c0040875ec3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java
@@ -1,13 +1,29 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.MockModelContext;
 import com.yahoo.config.model.NullConfigModelRegistry;
-import com.yahoo.config.model.api.*;
+import com.yahoo.config.model.api.ConfigServerSpec;
+import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.HostProvisioner;
+import com.yahoo.config.model.api.Model;
+import com.yahoo.config.model.api.ModelContext;
+import com.yahoo.config.model.api.ModelCreateResult;
+import com.yahoo.config.model.api.ServiceInfo;
 import com.yahoo.config.model.test.MockApplicationPackage;
-import com.yahoo.config.provision.*;
+import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.ApplicationName;
+import com.yahoo.config.provision.Capacity;
+import com.yahoo.config.provision.ClusterMembership;
+import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.HostSpec;
+import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.ProvisionLogger;
+import com.yahoo.config.provision.Rotation;
+import com.yahoo.config.provision.TenantName;
+import com.yahoo.config.provision.Zone;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -100,7 +116,7 @@ public class VespaModelFactoryTest {
                                     ClusterMembership.from(ClusterSpec.from(ClusterSpec.Type.admin,
                                                                             new ClusterSpec.Id(routingClusterName),
                                                                             ClusterSpec.Group.from(0),
-                                                                            Optional.empty()),
+                                                                            Version.fromString("6.42")),
                                                            0));
             }
 
@@ -111,7 +127,7 @@ public class VespaModelFactoryTest {
                                                               ClusterMembership.from(ClusterSpec.from(ClusterSpec.Type.container,
                                                                                                       new ClusterSpec.Id(routingClusterName),
                                                                                                       ClusterSpec.Group.from(0),
-                                                                                                      Optional.empty()),
+                                                                                                      Version.fromString("6.42")),
                                                                                      0)));
             }
         };
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
index 8a3d241a79b..595013c506e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.model.content.utils;
 
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
+import com.yahoo.config.model.ConfigModelContext;
 import com.yahoo.config.model.api.HostProvisioner;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.deploy.DeployState;
@@ -23,6 +24,7 @@ import java.util.Optional;
 
 /**
  * For testing purposes only.
+ * 
  * @author geirst
  */
 public class ContentClusterUtils {
@@ -51,8 +53,9 @@ public class ContentClusterUtils {
     public static ContentCluster createCluster(String clusterXml, MockRoot root) throws Exception {
         Document doc = XML.getDocument(clusterXml);
         Admin admin = new Admin(root, new Yamas("vespa", 60), new Metrics(), Collections.emptyMap(), false);
-        DeployLogger deployLogger = new BaseDeployLogger();
-        return new ContentCluster.Builder(admin, deployLogger).build(Collections.emptyList(), root, doc.getDocumentElement());
+        ConfigModelContext context = ConfigModelContext.create(null, DeployState.createTestState(), null, root, null);
+        
+        return new ContentCluster.Builder(admin).build(Collections.emptyList(), context, doc.getDocumentElement());
     }
 
     public static ContentCluster createCluster(String clusterXml, List<String> searchDefinitions) throws Exception {
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java
index ff7ff0b4971..b78c4bb9f56 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterMembership.java
@@ -2,6 +2,7 @@
 package com.yahoo.config.provision;
 
 import com.yahoo.component.Version;
+import com.yahoo.component.Vtag;
 
 import java.util.Optional;
 
@@ -20,7 +21,7 @@ public class ClusterMembership {
 
     protected ClusterMembership() {}
 
-    private ClusterMembership(String stringValue, Optional<Version> vespaVersion) {
+    private ClusterMembership(String stringValue, Version vespaVersion) {
         String restValue;
         if (stringValue.endsWith("/retired")) {
             retired = true;
@@ -51,14 +52,14 @@ public class ClusterMembership {
         this.stringValue = toStringValue();
     }
 
-    private void initWithoutGroup(String[] components, Optional<Version> vespaVersion) {
-        this.cluster = ClusterSpec.requestVersion(ClusterSpec.Type.valueOf(components[0]),
-                                                  ClusterSpec.Id.from(components[1]),
-                                                  vespaVersion);
+    private void initWithoutGroup(String[] components, Version vespaVersion) {
+        this.cluster = ClusterSpec.request(ClusterSpec.Type.valueOf(components[0]),
+                                           ClusterSpec.Id.from(components[1]),
+                                           vespaVersion);
         this.index = Integer.parseInt(components[2]);
     }
 
-    private void initWithGroup(String[] components, Optional<Version> vespaVersion) {
+    private void initWithGroup(String[] components, Version vespaVersion) {
         this.cluster = ClusterSpec.from(ClusterSpec.Type.valueOf(components[0]), ClusterSpec.Id.from(components[1]),
                                         ClusterSpec.Group.from(Integer.valueOf(components[2])), vespaVersion);
         this.index = Integer.parseInt(components[3]);
@@ -115,10 +116,16 @@ public class ClusterMembership {
     @Deprecated
     // TODO: April 2017 - Remove this when no version older than 6.92 is in production
     public static ClusterMembership from(String stringValue, Optional<String> dockerImage) {
-        return fromVersion(stringValue, dockerImage.map(DockerImage::new).map(DockerImage::tagAsVersion));
+        return from(stringValue, dockerImage.map(DockerImage::new).map(DockerImage::tagAsVersion).orElse(Vtag.currentVersion));
     }
 
+    @Deprecated
+    // TODO: April 2017 - Remove this when no version older than 6.97 is in production
     public static ClusterMembership fromVersion(String stringValue, Optional<Version> vespaVersion) {
+        return new ClusterMembership(stringValue, vespaVersion.orElse(Vtag.currentVersion));
+    }
+
+    public static ClusterMembership from(String stringValue, Version vespaVersion) {
         return new ClusterMembership(stringValue, vespaVersion);
     }
 
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index ec655f0eee2..6a79f2f06ed 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -2,6 +2,8 @@
 package com.yahoo.config.provision;
 
 import com.yahoo.component.Version;
+import com.yahoo.component.Vtag;
+
 import java.util.Objects;
 import java.util.Optional;
 
@@ -55,7 +57,7 @@ public final class ClusterSpec {
     /** Create a specification <b>requesting</b> a cluster with these attributes */
     // TODO: April 2017 - Remove this when no version older than 6.97 is used anywhere
     public static ClusterSpec requestVersion(Type type, Id id, Optional<Version> vespaVersion) {
-        return new ClusterSpec(type, id, Optional.empty(), vespaVersion.get());
+        return new ClusterSpec(type, id, Optional.empty(), vespaVersion.orElse(Vtag.currentVersion));
     }
 
     public static ClusterSpec request(Type type, Id id, Version vespaVersion) {
@@ -65,18 +67,13 @@ public final class ClusterSpec {
     /** Create a specification <b>specifying</b> an existing cluster group having these attributes */
     // TODO: April 2017 - Remove this when no version older than 6.97 is used anywhere
     public static ClusterSpec from(Type type, Id id, Group groupId, Optional<Version> vespaVersion) {
-        return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion.get());
+        return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion.orElse(Vtag.currentVersion));
     }
 
-    /** Create a specification <b>specifying</b> an existing cluster group having these attributes */
-    // TODO: April 2017 - Remove this when no version older than 6.97 is used anywhere
     public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion) {
         return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion);
     }
 
-    neste: - sørg for at ingen bruker deprecateds over
-           - gå tilbake til NodeSpecification og sørg for at version sendes inn der fra ModelContext
-    
     @Override
     public String toString() {
         return String.join(" ", type.toString(), id.toString(),
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
index cc7d871d23f..01ef305034d 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ProvisionInfo.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
+import com.yahoo.component.Vtag;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
@@ -8,10 +9,13 @@ import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.SlimeUtils;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Optional;
+import java.util.Set;
 
 /**
- * Information about provisioned hosts, and (de)serialization (from)to JSON.
+ * Information about hosts provisioned for an application, and (de)serialization of this information to/from JSON.
  *
  * @author lulf
  * @since 5.12
@@ -23,7 +27,7 @@ public class ProvisionInfo {
     private static final String hostSpecHostName = "hostName";
     private static final String hostSpecMembership = "membership";
     private static final String hostSpecFlavor = "flavor";
-    private static final String dockerImage = "dockerImage";
+    private static final String hostSpecVespaVersion = "vespaVersion";
 
     private final Set<HostSpec> hosts = new LinkedHashSet<>();
 
@@ -47,7 +51,7 @@ public class ProvisionInfo {
         cursor.setString(hostSpecHostName, host.hostname());
         if (host.membership().isPresent()) {
             cursor.setString(hostSpecMembership, host.membership().get().stringValue());
-            cursor.setString(dockerImage, host.membership().get().cluster().dockerImage());
+            cursor.setString(hostSpecVespaVersion, host.membership().get().cluster().vespaVersion().toString());
         }
         if (host.flavor().isPresent())
             cursor.setString(hostSpecFlavor, host.flavor().get().name());
@@ -59,17 +63,17 @@ public class ProvisionInfo {
 
     private static ProvisionInfo fromSlime(Inspector inspector, Optional<NodeFlavors> nodeFlavors) {
         Inspector array = inspector.field(mappingKey);
-        final Set<HostSpec> hosts = new LinkedHashSet<>();
+        Set<HostSpec> hosts = new LinkedHashSet<>();
         array.traverse(new ArrayTraverser() {
             @Override
             public void entry(int i, Inspector inspector) {
-                hosts.add(createHostSpec(inspector.field(hostSpecKey), nodeFlavors));
+                hosts.add(deserializeHostSpec(inspector.field(hostSpecKey), nodeFlavors));
             }
         });
         return new ProvisionInfo(hosts);
     }
 
-    private static HostSpec createHostSpec(Inspector object, Optional<NodeFlavors> nodeFlavors) {
+    private static HostSpec deserializeHostSpec(Inspector object, Optional<NodeFlavors> nodeFlavors) {
         Optional<ClusterMembership> membership =
                 object.field(hostSpecMembership).valid() ? Optional.of(readMembership(object)) : Optional.empty();
         Optional<Flavor> flavor =
@@ -79,8 +83,11 @@ public class ProvisionInfo {
     }
 
     private static ClusterMembership readMembership(Inspector object) {
+        // TODO: When no version older than 6.97 is present anywhere, remove the possibility of the version field missing
         return ClusterMembership.from(object.field(hostSpecMembership).asString(),
-                                      object.field(dockerImage).valid() ? Optional.of(object.field(dockerImage).asString()) : Optional.empty());
+                                      object.field(hostSpecVespaVersion).valid() ? 
+                                      com.yahoo.component.Version.fromString(object.field(hostSpecVespaVersion).asString()) :
+                                      Vtag.currentVersion);
     }
 
     private static Optional<Flavor> readFlavor(Inspector object, Optional<NodeFlavors> nodeFlavors) {
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java
index 56da6dbcaa7..90a727a221f 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ClusterMembershipTest.java
@@ -1,6 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
+import com.yahoo.component.*;
+import com.yahoo.component.Version;
 import org.junit.Test;
 
 import java.util.Optional;
@@ -16,59 +18,59 @@ public class ClusterMembershipTest {
 
     @Test
     public void testContainerServiceInstance() {
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
         assertContainerService(ClusterMembership.from(cluster, 3));
     }
 
     @Test
     public void testContainerServiceInstanceFromString() {
-        assertContainerService(ClusterMembership.fromVersion("container/id1/3", Optional.empty()));
+        assertContainerService(ClusterMembership.from("container/id1/3", Vtag.currentVersion));
     }
 
     @Test
     public void testServiceInstance() {
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
         assertContentService(ClusterMembership.from(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceFromString() {
-        assertContentService(ClusterMembership.fromVersion("content/id1/37", Optional.empty()));
+        assertContentService(ClusterMembership.from("content/id1/37", Vtag.currentVersion));
     }
 
     @Test
     public void testServiceInstanceWithGroup() {
         ClusterSpec cluster = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"),
-                                               ClusterSpec.Group.from(4), Optional.empty());
+                                               ClusterSpec.Group.from(4), Version.fromString("6.42"));
         assertContentServiceWithGroup(ClusterMembership.from(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithGroupFromString() {
-        assertContentServiceWithGroup(ClusterMembership.from("content/id1/4/37", Optional.empty()));
+        assertContentServiceWithGroup(ClusterMembership.from("content/id1/4/37", Vtag.currentVersion));
     }
 
     @Test
     public void testServiceInstanceWithRetire() {
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
         assertContentServiceWithRetire(ClusterMembership.retiredFrom(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithRetireFromString() {
-        assertContentServiceWithRetire(ClusterMembership.from("content/id1/37/retired", Optional.empty()));
+        assertContentServiceWithRetire(ClusterMembership.from("content/id1/37/retired", Vtag.currentVersion));
     }
 
     @Test
     public void testServiceInstanceWithGroupAndRetire() {
         ClusterSpec cluster = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("id1"),
-                                               ClusterSpec.Group.from(4), Optional.empty());
+                                               ClusterSpec.Group.from(4), Version.fromString("6.42"));
         assertContentServiceWithGroupAndRetire(ClusterMembership.retiredFrom(cluster, 37));
     }
 
     @Test
     public void testServiceInstanceWithGroupAndRetireFromString() {
-        assertContentServiceWithGroupAndRetire(ClusterMembership.from("content/id1/4/37/retired", Optional.empty()));
+        assertContentServiceWithGroupAndRetire(ClusterMembership.from("content/id1/4/37/retired", Vtag.currentVersion));
     }
 
     private void assertContainerService(ClusterMembership instance) {
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java
index b16e2d76ca8..23fe00d0ec5 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/HostFilterTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
+import com.yahoo.component.Vtag;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -70,7 +71,7 @@ public class HostFilterTest {
     }
 
     private Optional<ClusterMembership> membership(String membershipString) {
-        return Optional.of(ClusterMembership.from(membershipString, Optional.empty()));
+        return Optional.of(ClusterMembership.from(membershipString, Vtag.currentVersion));
     }
 
 }
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
index 2538d687c1d..d54b76c1b65 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
@@ -20,7 +20,7 @@ public class ProvisionInfoTest {
 
     private final HostSpec h1 = new HostSpec("host1", Optional.empty());
     private final HostSpec h2 = new HostSpec("host2", Optional.empty());
-    private final HostSpec h3 = new HostSpec("host3", Optional.of(ClusterMembership.from("container/test/0", Optional.empty())));
+    private final HostSpec h3 = new HostSpec("host3", Optional.of(ClusterMembership.from("container/test/0", com.yahoo.component.Version.fromString("6.73.1"))));
     private final HostSpec h4 = new HostSpec("host4", Optional.of(ClusterMembership.from("container/test/1", Optional.of("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1"))));
 
     @Test
@@ -57,6 +57,7 @@ public class ProvisionInfoTest {
         assertTrue(serializedInfo.getHosts().contains(h4));
         assertTrue(!getHost(h1.hostname(), serializedInfo.getHosts()).membership().isPresent());
         assertEquals("container/test/0", getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().stringValue());
+        assertEquals(h3.membership().get().cluster().vespaVersion(), getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().cluster().vespaVersion());
         assertEquals("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.1", getHost(h4.hostname(), serializedInfo.getHosts()).membership().get().cluster().dockerImage());
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
index afeb84c02b4..08cb5c92c1b 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
@@ -1,10 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.session;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Rotation;
 import com.yahoo.config.provision.TenantName;
-import com.yahoo.config.provision.Version;
 import com.yahoo.container.jdisc.HttpRequest;
 
 import org.junit.Test;
@@ -28,8 +28,7 @@ public class PrepareParamsTest {
 
     @Test
     public void testCorrectParsing() {
-        PrepareParams prepareParams = createParams("http://foo:19071/application/v2/",
-                TenantName.defaultName());
+        PrepareParams prepareParams = createParams("http://foo:19071/application/v2/", TenantName.defaultName());
 
         assertThat(prepareParams.getApplicationId(), is(ApplicationId.defaultId()));
         assertFalse(prepareParams.isDryRun());
@@ -51,28 +50,28 @@ public class PrepareParamsTest {
     @Test
     public void testCorrectParsingWithRotation() {
         PrepareParams prepareParams = createParams(request + "&" +
-                        PrepareParams.ROTATIONS_PARAM_NAME + "=" + rotation,
-                TenantName.from("foo"));
+                                                   PrepareParams.ROTATIONS_PARAM_NAME + "=" + rotation,
+                                                   TenantName.from("foo"));
 
         assertThat(prepareParams.getApplicationId().serializedForm(), is("foo:baz:default"));
         assertTrue(prepareParams.isDryRun());
         assertFalse(prepareParams.ignoreValidationErrors());
-        final Version expectedVersion = Version.fromString(vespaVersion);
+        Version expectedVersion = Version.fromString(vespaVersion);
         assertThat(prepareParams.vespaVersion().get(), is(expectedVersion));
         assertTrue(prepareParams.getTimeoutBudget().hasTimeLeft());
-        final Set<Rotation> rotations = prepareParams.rotations();
+        Set<Rotation> rotations = prepareParams.rotations();
         assertThat(rotations.size(), is(1));
         assertThat(rotations, contains(equalTo(new Rotation(rotation))));
     }
 
     @Test
     public void testCorrectParsingWithSeveralRotations() {
-        final String rotationTwo = "rotation-043.vespa.a02.yahoodns.net";
-        final String twoRotations = rotation + "," + rotationTwo;
+        String rotationTwo = "rotation-043.vespa.a02.yahoodns.net";
+        String twoRotations = rotation + "," + rotationTwo;
         PrepareParams prepareParams = createParams(request + "&" +
-                        PrepareParams.ROTATIONS_PARAM_NAME + "=" + twoRotations,
-                TenantName.from("foo"));
-        final Set<Rotation> rotations = prepareParams.rotations();
+                                      PrepareParams.ROTATIONS_PARAM_NAME + "=" + twoRotations,
+                                      TenantName.from("foo"));
+        Set<Rotation> rotations = prepareParams.rotations();
         assertThat(rotations, containsInAnyOrder(new Rotation(rotation), new Rotation(rotationTwo)));
     }
 
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolder.java b/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolder.java
index 132c0074cb7..54d6e005a90 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolder.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolder.java
@@ -25,6 +25,7 @@ import java.util.logging.Logger;
  * @author hmusum
  */
 public class LastErrorsHolder extends AbstractLogHandler implements ConnectionFactory {
+
     private static final Logger log = Logger.getLogger(LastErrorsHolder.class.getName());
     private static final int maxNumErrors = 100;
     private final Object lock = new Object();
diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolderTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolderTestCase.java
index 967441ce250..a0e97c28f76 100644
--- a/logserver/src/test/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolderTestCase.java
+++ b/logserver/src/test/java/com/yahoo/logserver/handlers/lasterrorsholder/LastErrorsHolderTestCase.java
@@ -23,6 +23,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 public class LastErrorsHolderTestCase {
+
     private static final int serverPort = 18324;
     private static final int lastErrorsHolderPort = 18326;
     Server server;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index c91548f9ca7..b6b6b24fa89 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.provision.persistence;
 
 import com.google.common.collect.ImmutableSet;
 import com.yahoo.component.Version;
+import com.yahoo.component.Vtag;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.ClusterMembership;
@@ -223,7 +224,7 @@ public class NodeSerializer {
         } else {
             vespaVersion = softwareVersionFromSlime(object.field(wantedVespaVersionKey));
         }
-        return ClusterMembership.fromVersion(object.field(serviceIdKey).asString(), vespaVersion);
+        return ClusterMembership.from(object.field(serviceIdKey).asString(), vespaVersion.orElse(Vtag.currentVersion));
     }
 
     private Optional<Version> softwareVersionFromSlime(Inspector object) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
index 2b5d8cb1708..a8490076d5b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java
@@ -101,15 +101,15 @@ public class MockNodeRepository extends NodeRepository {
         setDirty("host55.yahoo.com");
 
         ApplicationId app1 = ApplicationId.from(TenantName.from("tenant1"), ApplicationName.from("application1"), InstanceName.from("instance1"));
-        ClusterSpec cluster1 = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Optional.of(Version.fromString("6.42")));
+        ClusterSpec cluster1 = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("id1"), Version.fromString("6.42"));
         provisioner.prepare(app1, cluster1, Capacity.fromNodeCount(2), 1, null);
 
         ApplicationId app2 = ApplicationId.from(TenantName.from("tenant2"), ApplicationName.from("application2"), InstanceName.from("instance2"));
-        ClusterSpec cluster2 = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("id2"), Optional.empty());
+        ClusterSpec cluster2 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id2"), Version.fromString("6.42"));
         activate(provisioner.prepare(app2, cluster2, Capacity.fromNodeCount(2), 1, null), app2, provisioner);
 
         ApplicationId app3 = ApplicationId.from(TenantName.from("tenant3"), ApplicationName.from("application3"), InstanceName.from("instance3"));
-        ClusterSpec cluster3 = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("id3"), Optional.empty());
+        ClusterSpec cluster3 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("id3"), Version.fromString("6.42"));
         activate(provisioner.prepare(app3, cluster3, Capacity.fromNodeCount(2), 1, null), app3, provisioner);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
index 35232e703c1..7da61a6fcbd 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.maintenance;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.Capacity;
@@ -105,7 +106,7 @@ public class FailedExpirerTest {
         List<Node> provisioned = nodeRepository.getNodes(NodeType.tenant, Node.State.provisioned);
         nodeRepository.setReady(nodeRepository.setDirty(provisioned));
         ApplicationId applicationId = ApplicationId.from(TenantName.from("foo"), ApplicationName.from("bar"), InstanceName.from("fuz"));
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
         provisioner.prepare(applicationId, cluster, Capacity.fromNodeCount(3), 1, null);
         NestedTransaction transaction = new NestedTransaction().add(new CuratorTransaction(curator));
         provisioner.activate(transaction, applicationId, ProvisioningTester.toHostSpecs(nodes));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java
index d0b7d78b217..b820a11bf74 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.maintenance;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.Capacity;
@@ -41,7 +42,7 @@ public class InactiveAndFailedExpirerTest {
         List<Node> nodes = tester.makeReadyNodes(2, "default");
 
         // Allocate then deallocate 2 nodes
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
         tester.prepare(applicationId, cluster, Capacity.fromNodeCount(2), 1);
         tester.activate(applicationId, ProvisioningTester.toHostSpecs(nodes));
         assertEquals(2, tester.getNodes(applicationId, Node.State.active).size());
@@ -78,7 +79,9 @@ public class InactiveAndFailedExpirerTest {
         List<Node> nodes = tester.makeReadyNodes(1, "default");
 
         // Allocate and deallocate a single node
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, 
+                                                  ClusterSpec.Id.from("test"), 
+                                                  Version.fromString("6.42"));
         tester.prepare(applicationId, cluster, Capacity.fromNodeCount(1), 1);
         tester.activate(applicationId, ProvisioningTester.toHostSpecs(nodes));
         assertEquals(1, tester.getNodes(applicationId, Node.State.active).size());
@@ -104,8 +107,8 @@ public class InactiveAndFailedExpirerTest {
     @Test
     public void node_that_wants_to_retire_is_moved_to_parked() {
         ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")));
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"),
-                                                         Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), 
+                                                  Version.fromString("6.42"));
         tester.makeReadyNodes(5, "default");
 
         // Allocate two nodes
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java
index 86aef3617f0..fb703cfdd2f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java
@@ -103,8 +103,8 @@ public class NodeFailTester {
         tester.createHostNodes(3);
 
         // Create applications
-        ClusterSpec clusterApp1 = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Optional.empty());
-        ClusterSpec clusterApp2 = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        ClusterSpec clusterApp1 = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
+        ClusterSpec clusterApp2 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
         int wantedNodesApp1 = 5;
         int wantedNodesApp2 = 7;
         tester.activate(app1, clusterApp1, wantedNodesApp1);
@@ -132,9 +132,9 @@ public class NodeFailTester {
         }
 
         // Create applications
-        ClusterSpec clusterNodeAdminApp = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("node-admin"), Optional.empty());
-        ClusterSpec clusterApp1 = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Optional.of(Version.fromString("6.75.0")));
-        ClusterSpec clusterApp2 = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.of(Version.fromString("6.75.0")));
+        ClusterSpec clusterNodeAdminApp = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("node-admin"), Version.fromString("6.42"));
+        ClusterSpec clusterApp1 = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Version.fromString("6.75.0"));
+        ClusterSpec clusterApp2 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.75.0"));
         Capacity allHosts = Capacity.fromRequiredNodeType(NodeType.host);
         Capacity capacity1 = Capacity.fromNodeCount(3, Optional.of("docker"));
         Capacity capacity2 = Capacity.fromNodeCount(5, Optional.of("docker"));
@@ -163,7 +163,9 @@ public class NodeFailTester {
 
         // Create application
         Capacity allProxies = Capacity.fromRequiredNodeType(NodeType.proxy);
-        ClusterSpec clusterApp1 = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Optional.empty());
+        ClusterSpec clusterApp1 = ClusterSpec.request(ClusterSpec.Type.container, 
+                                                      ClusterSpec.Id.from("test"), 
+                                                      Version.fromString("6.42"));
         tester.activate(app1, clusterApp1, allProxies);
         assertEquals(16, tester.nodeRepository.getNodes(NodeType.proxy, Node.State.active).size());
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java
index 63b22ba4726..8f9df5ac736 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.maintenance;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.Capacity;
@@ -108,8 +109,8 @@ public class OperatorChangeApplicationMaintainerTest {
 
         final ApplicationId app1 = ApplicationId.from(TenantName.from("foo1"), ApplicationName.from("bar"), InstanceName.from("fuz"));
         final ApplicationId app2 = ApplicationId.from(TenantName.from("foo2"), ApplicationName.from("bar"), InstanceName.from("fuz"));
-        final ClusterSpec clusterApp1 = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Optional.empty());
-        final ClusterSpec clusterApp2 = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        final ClusterSpec clusterApp1 = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
+        final ClusterSpec clusterApp2 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
         final int wantedNodesApp1 = 5;
         final int wantedNodesApp2 = 7;
         MockDeployer deployer; // created on activation
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
index 9094e3fc599..800a750ff8a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.maintenance;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.Capacity;
@@ -151,8 +152,8 @@ public class PeriodicApplicationMaintainerTest {
 
         final ApplicationId app1 = ApplicationId.from(TenantName.from("foo1"), ApplicationName.from("bar"), InstanceName.from("fuz"));
         final ApplicationId app2 = ApplicationId.from(TenantName.from("foo2"), ApplicationName.from("bar"), InstanceName.from("fuz"));
-        final ClusterSpec clusterApp1 = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Optional.empty());
-        final ClusterSpec clusterApp2 = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        final ClusterSpec clusterApp1 = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
+        final ClusterSpec clusterApp2 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
         final int wantedNodesApp1 = 5;
         final int wantedNodesApp2 = 7;
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirerTest.java
index 8d41adec2cd..317e4da8da7 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirerTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.maintenance;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterSpec;
@@ -52,7 +53,7 @@ public class ReservationExpirerTest {
         assertEquals(2, nodeRepository.getNodes(NodeType.tenant, Node.State.dirty).size());
         nodeRepository.setReady(nodes);
         ApplicationId applicationId = new ApplicationId.Builder().tenant("foo").applicationName("bar").instanceName("fuz").build();
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
         provisioner.prepare(applicationId, cluster, Capacity.fromNodeCount(2), 1, null);
         assertEquals(2, nodeRepository.getNodes(NodeType.tenant, Node.State.reserved).size());
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java
index 3e6281d59a7..986566be783 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.maintenance;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.Capacity;
@@ -57,7 +58,7 @@ public class RetiredExpirerTest {
 
         // Allocate content cluster of sizes 7 -> 2 -> 3:
         // Should end up with 3 nodes in the cluster (one previously retired), and 3 retired
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
         int wantedNodes;
         activate(applicationId, cluster, wantedNodes=7, 1, provisioner);
         activate(applicationId, cluster, wantedNodes=2, 1, provisioner);
@@ -94,7 +95,7 @@ public class RetiredExpirerTest {
 
         ApplicationId applicationId = ApplicationId.from(TenantName.from("foo"), ApplicationName.from("bar"), InstanceName.from("fuz"));
 
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42"));
         activate(applicationId, cluster, 8, 8, provisioner);
         activate(applicationId, cluster, 1, 1, provisioner);
         assertEquals(8, nodeRepository.getNodes(applicationId, Node.State.active).size());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
index 3d38adca4d3..e8479ef9ec7 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/SerializationTest.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.provision.persistence;
 
 import com.google.common.collect.ImmutableSet;
 import com.yahoo.component.Version;
+import com.yahoo.component.Vtag;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.ClusterMembership;
@@ -65,7 +66,7 @@ public class SerializationTest {
         node = node.allocate(ApplicationId.from(TenantName.from("myTenant"),
                                                 ApplicationName.from("myApplication"),
                                                 InstanceName.from("myInstance")),
-                             ClusterMembership.fromVersion("content/myId/0/0", Optional.empty()),
+                             ClusterMembership.from("content/myId/0/0", Vtag.currentVersion),
                              clock.instant());
         assertEquals(1, node.history().events().size());
         node = node.withRestart(new Generation(1, 2));
@@ -101,7 +102,7 @@ public class SerializationTest {
         Node node = createNode().allocate(ApplicationId.from(TenantName.from("myTenant"),
                 ApplicationName.from("myApplication"),
                 InstanceName.from("myInstance")),
-                ClusterMembership.fromVersion("content/myId/0/0", Optional.empty()),
+                ClusterMembership.from("content/myId/0/0", Vtag.currentVersion),
                 clock.instant());
         Node copy = nodeSerializer.fromJson(Node.State.provisioned, nodeSerializer.toJson(node));
         assertEquals(NodeType.host, copy.type());
@@ -155,7 +156,7 @@ public class SerializationTest {
         node = node.allocate(ApplicationId.from(TenantName.from("myTenant"),
                                                 ApplicationName.from("myApplication"),
                                                 InstanceName.from("myInstance")),
-                             ClusterMembership.fromVersion("content/myId/0", Optional.empty()),
+                             ClusterMembership.from("content/myId/0", Vtag.currentVersion),
                              clock.instant());
         assertEquals(1, node.history().events().size());
         clock.advance(Duration.ofMinutes(2));
@@ -203,7 +204,7 @@ public class SerializationTest {
         node = node.allocate(ApplicationId.from(TenantName.from("myTenant"),
                              ApplicationName.from("myApplication"),
                              InstanceName.from("myInstance")),
-                             ClusterMembership.fromVersion("content/myId/0/0", Optional.empty()),
+                             ClusterMembership.from("content/myId/0/0", Vtag.currentVersion),
                              clock.instant());
 
         node = node.with(node.status().setFailCount(0));
@@ -216,10 +217,8 @@ public class SerializationTest {
     public void serialize_docker_image() {
         Node node = createNode();
 
-        Optional<Version> version = Optional.of("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0")
-                .map(DockerImage::new)
-                .map(DockerImage::tagAsVersion);
-        ClusterMembership clusterMembership = ClusterMembership.fromVersion("content/myId/0", version);
+        Version version = new DockerImage("docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0").tagAsVersion();
+        ClusterMembership clusterMembership = ClusterMembership.from("content/myId/0", version);
 
         Node nodeWithAllocation = node.with(
                 new Allocation(ApplicationId.from(TenantName.from("myTenant"),
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
index 4d83a5b5874..6ba2c40186d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AclProvisioningTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.provisioning;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterSpec;
@@ -223,8 +224,8 @@ public class AclProvisioningTest {
     }
 
     private List<Node> allocateNodes(Capacity capacity, ApplicationId applicationId) {
-        ClusterSpec cluster = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"),
-                                                         Optional.empty());
+        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"),
+                                                  Version.fromString("6.42"));
         List<HostSpec> prepared = tester.prepare(applicationId, cluster, capacity, 1);
         tester.activate(applicationId, new HashSet<>(prepared));
         return tester.getNodes(applicationId, Node.State.active).asList();
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
index 3f3284115bc..89119441a93 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertEquals;
  * @author bratseth
  */
 public class DockerProvisioningTest {
+
     private static final String dockerFlavor = "docker1";
 
     @Test
@@ -35,21 +36,21 @@ public class DockerProvisioningTest {
             tester.makeReadyDockerNodes(1, dockerFlavor, "dockerHost" + i);
         }
 
-        Optional<Version> wantedVespaVersion = Optional.of(Version.fromString("6.39"));
-        final int nodeCount = 7;
+        Version wantedVespaVersion = Version.fromString("6.39");
+        int nodeCount = 7;
         List<HostSpec> hosts = tester.prepare(application1,
-                                              ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), wantedVespaVersion),
+                                              ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), wantedVespaVersion),
                                               nodeCount, 1, dockerFlavor);
         tester.activate(application1, new HashSet<>(hosts));
 
-        final NodeList nodes = tester.getNodes(application1, Node.State.active);
+        NodeList nodes = tester.getNodes(application1, Node.State.active);
         assertEquals(nodeCount, nodes.size());
         assertEquals(dockerFlavor, nodes.asList().get(0).flavor().canonicalName());
 
         // Upgrade Vespa version on nodes
-        Optional<Version> upgradedWantedVespaVersion = Optional.of(Version.fromString("6.40"));
+        Version upgradedWantedVespaVersion = Version.fromString("6.40");
         List<HostSpec> upgradedHosts = tester.prepare(application1,
-                                                      ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), upgradedWantedVespaVersion),
+                                                      ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), upgradedWantedVespaVersion),
                                                       nodeCount, 1, dockerFlavor);
         tester.activate(application1, new HashSet<>(upgradedHosts));
         final NodeList upgradedNodes = tester.getNodes(application1, Node.State.active);
@@ -65,10 +66,10 @@ public class DockerProvisioningTest {
         ApplicationId application1 = tester.makeApplicationId();
         tester.makeReadyDockerNodes(1, dockerFlavor, "dockerHost");
 
-        List<HostSpec> hosts = tester.prepare(application1, ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), Optional.empty()), 1, 1, dockerFlavor);
+        List<HostSpec> hosts = tester.prepare(application1, ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), Version.fromString("6.42")), 1, 1, dockerFlavor);
         tester.activate(application1, new HashSet<>(hosts));
 
-        final NodeList nodes = tester.getNodes(application1, Node.State.active);
+        NodeList nodes = tester.getNodes(application1, Node.State.active);
         assertEquals(1, nodes.size());
         assertEquals(dockerFlavor, nodes.asList().get(0).flavor().canonicalName());
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java
index 372819b3f98..3109afb7190 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.provisioning;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterSpec;
@@ -196,7 +197,7 @@ public class MultigroupProvisioningTest {
         assertEquals("No additional groups are retained containing retired nodes", wantedGroups, allGroups.size());
     }
 
-    private ClusterSpec cluster() { return ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Optional.empty()); }
+    private ClusterSpec cluster() { return ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42")); }
 
     private Set<HostSpec> prepare(ApplicationId application, Capacity capacity, int groupCount, ProvisioningTester tester) {
         return new HashSet<>(tester.prepare(application, cluster(), capacity, groupCount));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
index a3ff24d0e73..209c5195812 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java
@@ -1,5 +1,6 @@
 package com.yahoo.vespa.hosted.provision.provisioning;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterSpec;
@@ -83,9 +84,9 @@ public class NodeTypeProvisioningTest {
 
     private List<HostSpec> deployProxies(ApplicationId application, ProvisioningTester tester) {
         return tester.prepare(application, 
-                              ClusterSpec.requestVersion(ClusterSpec.Type.container,
-                                                         ClusterSpec.Id.from("test"),
-                                                         Optional.empty()),
+                              ClusterSpec.request(ClusterSpec.Type.container,
+                                                  ClusterSpec.Id.from("test"),
+                                                   Version.fromString("6.42")),
                               Capacity.fromRequiredNodeType(NodeType.proxy),
                               1);
         
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index d89541daebb..3ecfae3312a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.hosted.provision.provisioning;
 
 import com.yahoo.cloud.config.ConfigserverConfig;
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.Capacity;
@@ -659,8 +660,8 @@ public class ProvisioningTest {
         tester.makeReadyNodes(6, "large-variant-variant"); //cost = 11
 
         ApplicationId applicationId = tester.makeApplicationId();
-        ClusterSpec contentClusterSpec = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), Optional.empty());
-        ClusterSpec containerClusterSpec = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("myContainer"), Optional.empty());
+        ClusterSpec contentClusterSpec = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), Version.fromString("6.42"));
+        ClusterSpec containerClusterSpec = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("myContainer"), Version.fromString("6.42"));
 
         List<HostSpec> containerNodes = tester.prepare(applicationId, containerClusterSpec, 5, 1, "large");
         List<HostSpec> contentNodes = tester.prepare(applicationId, contentClusterSpec, 10, 1, "large");
@@ -681,10 +682,10 @@ public class ProvisioningTest {
 
     private SystemState prepare(ApplicationId application, int container0Size, int container1Size, int content0Size, int content1Size, String flavor, ProvisioningTester tester) {
         // "deploy prepare" with a two container clusters and a storage cluster having of two groups
-        ClusterSpec containerCluster0 = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("container0"), Optional.empty());
-        ClusterSpec containerCluster1 = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("container1"), Optional.empty());
-        ClusterSpec contentCluster0 = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("content0"), Optional.empty());
-        ClusterSpec contentCluster1 = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("content1"), Optional.empty());
+        ClusterSpec containerCluster0 = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("container0"), Version.fromString("6.42"));
+        ClusterSpec containerCluster1 = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("container1"), Version.fromString("6.42"));
+        ClusterSpec contentCluster0 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("content0"), Version.fromString("6.42"));
+        ClusterSpec contentCluster1 = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("content1"), Version.fromString("6.42"));
 
         Set<HostSpec> container0 = prepare(application, containerCluster0, container0Size, 1, flavor, tester);
         Set<HostSpec> container1 = prepare(application, containerCluster1, container1Size, 1, flavor, tester);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java
index ac7fdc3d44f..1cb27df3972 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.provisioning;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
@@ -31,8 +32,8 @@ import static org.junit.Assert.assertNotNull;
 public class VirtualNodeProvisioningTest {
 
     private static final String flavor = "v-4-8-100";
-    private static final ClusterSpec contentClusterSpec = ClusterSpec.requestVersion(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), Optional.empty());
-    private static final ClusterSpec containerClusterSpec = ClusterSpec.requestVersion(ClusterSpec.Type.container, ClusterSpec.Id.from("myContainer"), Optional.empty());
+    private static final ClusterSpec contentClusterSpec = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("myContent"), Version.fromString("6.42"));
+    private static final ClusterSpec containerClusterSpec = ClusterSpec.request(ClusterSpec.Type.container, ClusterSpec.Id.from("myContainer"), Version.fromString("6.42"));
 
     private ProvisioningTester tester;
     private ApplicationId applicationId;
@@ -110,9 +111,9 @@ public class VirtualNodeProvisioningTest {
         tester.makeReadyVirtualNodes(1, flavor, "parentHost5");
         tester.makeReadyVirtualNodes(1, flavor, "parentHost6");
 
-        final int containerNodeCount = 2;
-        final int contentNodeCount = 2;
-        final int groups = 1;
+        int containerNodeCount = 2;
+        int contentNodeCount = 2;
+        int groups = 1;
         List<HostSpec> containerHosts = prepare(containerClusterSpec, containerNodeCount, groups);
         List<HostSpec> contentHosts = prepare(contentClusterSpec, contentNodeCount, groups);
         activate(containerHosts, contentHosts);
@@ -141,9 +142,9 @@ public class VirtualNodeProvisioningTest {
         tester.makeReadyVirtualNodes(1, flavor, "parentHost3");
         tester.makeReadyVirtualNodes(1, flavor, "parentHost4");
 
-        final int containerNodeCount = 2;
-        final int contentNodeCount = 2;
-        final int groups = 1;
+        int containerNodeCount = 2;
+        int contentNodeCount = 2;
+        int groups = 1;
         List<HostSpec> containerHosts = prepare(containerClusterSpec, containerNodeCount, groups);
         List<HostSpec> contentHosts = prepare(contentClusterSpec, contentNodeCount, groups);
         activate(containerHosts, contentHosts);
@@ -170,11 +171,11 @@ public class VirtualNodeProvisioningTest {
         tester.makeReadyVirtualNodes(2, flavor, "parentHost1");
         tester.makeReadyVirtualNodes(1, flavor, "parentHost2");
 
-        final int contentNodeCount = 3;
+        int contentNodeCount = 3;
         List<HostSpec> hosts = prepare(contentClusterSpec, contentNodeCount, 1);
         activate(hosts);
 
-        final List<Node> nodes = getNodes(applicationId);
+        List<Node> nodes = getNodes(applicationId);
         assertDistinctParentHosts(nodes, ClusterSpec.Type.content, contentNodeCount);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json
index b2a0cced9f5..7a9a70b0f9d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node1.json
@@ -26,6 +26,8 @@
   },
   "restartGeneration": 0,
   "currentRestartGeneration": 0,
+  "wantedDockerImage":"docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0",
+  "wantedVespaVersion":"6.42.0",
   "rebootGeneration": 1,
   "currentRebootGeneration": 0,
   "failCount": 0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json
index 83452ddedfc..e7d565bdd09 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node2.json
@@ -26,6 +26,8 @@
   },
   "restartGeneration": 0,
   "currentRestartGeneration": 0,
+  "wantedDockerImage":"docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0",
+  "wantedVespaVersion":"6.42.0",
   "rebootGeneration": 1,
   "currentRebootGeneration": 0,
   "failCount": 0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json
index 5cba6a90bbe..483e90b2641 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node3.json
@@ -24,6 +24,8 @@
   },
   "restartGeneration": 0,
   "currentRestartGeneration": 0,
+  "wantedDockerImage":"docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0",
+  "wantedVespaVersion":"6.42.0",
   "rebootGeneration": 1,
   "currentRebootGeneration": 0,
   "failCount": 0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json
index 112219a8778..0a3961d7217 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node6.json
@@ -26,6 +26,8 @@
   },
   "restartGeneration": 0,
   "currentRestartGeneration": 0,
+  "wantedDockerImage":"docker-registry.ops.yahoo.com:4443/vespa/ci:6.42.0",
+  "wantedVespaVersion":"6.42.0",
   "rebootGeneration": 1,
   "currentRebootGeneration": 0,
   "failCount": 0,