Remove redundant tags wiring

31 files changed, 80 insertions, 223 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java
index c3e9b99f562..de4ea62f671 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java
@@ -2,7 +2,6 @@
 package com.yahoo.config.model.application.provider;
 
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Tags;
 
 import java.util.Set;
 
@@ -15,8 +14,6 @@ public class DeployData {
 
     private final ApplicationId applicationId;
 
-    private final Tags tags;
-
     /** The absolute path to the directory holding the application */
     private final String deployedFromDir;
 
@@ -32,14 +29,12 @@ public class DeployData {
 
     public DeployData(String deployedFromDir,
                       ApplicationId applicationId,
-                      Tags tags,
                       Long deployTimestamp,
                       boolean internalRedeploy,
                       Long generation,
                       long currentlyActiveGeneration) {
         this.deployedFromDir = deployedFromDir;
         this.applicationId = applicationId;
-        this.tags = tags;
         this.deployTimestamp = deployTimestamp;
         this.internalRedeploy = internalRedeploy;
         this.generation = generation;
@@ -58,6 +53,4 @@ public class DeployData {
 
     public ApplicationId getApplicationId() { return applicationId; }
 
-    public Tags getTags() { return tags; }
-
 }
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index 2d91f811e8b..c095b9ad586 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -142,7 +142,6 @@ public class FilesApplicationPackage extends AbstractApplicationPackage {
                                        deployData.getDeployTimestamp(),
                                        deployData.isInternalRedeploy(),
                                        deployData.getApplicationId(),
-                                       deployData.getTags(),
                                        computeCheckSum(appDir),
                                        deployData.getGeneration(),
                                        deployData.getCurrentlyActiveGeneration());
@@ -489,7 +488,6 @@ public class FilesApplicationPackage extends AbstractApplicationPackage {
                                                                       ApplicationId.from(TenantName.defaultName(),
                                                                                          ApplicationName.from(originalAppDir),
                                                                                          InstanceName.defaultName()),
-                                                                      Tags.empty(),
                                                                       "",
                                                                       0L,
                                                                       0L);
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java
index c830c2baa1f..3a58f493e50 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationMetaData.java
@@ -10,9 +10,6 @@ import com.yahoo.slime.SlimeUtils;
 import com.yahoo.text.Utf8;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Metadata about an application package.
@@ -25,28 +22,25 @@ public class ApplicationMetaData {
     private final long deployTimestamp;
     private final boolean internalRedeploy;
     private final ApplicationId applicationId;
-    private final Tags tags;
     private final String checksum;
     private final long generation;
     private final long previousActiveGeneration;
 
     public ApplicationMetaData(String deployedFromDir, Long deployTimestamp, boolean internalRedeploy,
-                               ApplicationId applicationId, Tags tags,
-                               String checksum, Long generation, long previousActiveGeneration) {
+                               ApplicationId applicationId, String checksum, Long generation, long previousActiveGeneration) {
         this.deployedFromDir = deployedFromDir;
         this.deployTimestamp = deployTimestamp;
         this.internalRedeploy = internalRedeploy;
         this.applicationId = applicationId;
-        this.tags = tags;
         this.checksum = checksum;
         this.generation = generation;
         this.previousActiveGeneration = previousActiveGeneration;
     }
 
     @Deprecated // TODO: Remove on Vespa 9
-    public ApplicationMetaData(String deployedFromDir, Long deployTimestamp, boolean internalRedeploy,
-                               ApplicationId applicationId, String checksum, Long generation, long previousActiveGeneration) {
-        this(deployedFromDir, deployTimestamp, internalRedeploy, applicationId, Tags.empty(), checksum, generation, previousActiveGeneration);
+    public ApplicationMetaData(String deployedFromDir, Long deployTimestamp, boolean internalRedeploy, ApplicationId applicationId,
+                               Tags ignored, String checksum, Long generation, long previousActiveGeneration) {
+        this(deployedFromDir, deployTimestamp, internalRedeploy, applicationId, checksum, generation, previousActiveGeneration);
     }
 
     @Deprecated // TODO: Remove on Vespa 9
@@ -73,8 +67,6 @@ public class ApplicationMetaData {
 
     public ApplicationId getApplicationId() { return applicationId; }
 
-    public Tags getTags() { return tags; }
-
     /**
      * Gets the time the application was deployed.
      * Will return null if a problem occurred while getting metadata.
@@ -95,7 +87,7 @@ public class ApplicationMetaData {
      */
     public boolean isInternalRedeploy() { return internalRedeploy; }
 
-    /** Returns an md5 hash of the contents of the application package */
+    /** Returns an MD5 hash of the contents of the application package */
     public String getChecksum() { return checksum; }
 
     /** Returns the previously active generation at the point when this application was created. */
@@ -117,7 +109,6 @@ public class ApplicationMetaData {
                                            deploy.field("timestamp").asLong(),
                                            booleanField("internalRedeploy", false, deploy),
                                            ApplicationId.fromSerializedForm(app.field("id").asString()),
-                                           Tags.fromString(deploy.field("tags").asString()),
                                            app.field("checksum").asString(),
                                            app.field("generation").asLong(),
                                            app.field("previousActiveGeneration").asLong());
@@ -133,7 +124,6 @@ public class ApplicationMetaData {
         deploy.setString("from", deployedFromDir);
         deploy.setLong("timestamp", deployTimestamp);
         deploy.setBool("internalRedeploy", internalRedeploy);
-        deploy.setString("tags", tags.asString());
         Cursor app = meta.setObject("application");
         app.setString("id", applicationId.serializedForm());
         app.setString("checksum", checksum);
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index 2d98c8b35c0..9ee279c68d3 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -10,7 +10,6 @@ import com.yahoo.config.application.api.UnparsedConfigDefinition;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.io.IOUtils;
 import com.yahoo.io.reader.NamedReader;
@@ -86,7 +85,6 @@ public class MockApplicationPackage implements ApplicationPackage {
                                                       ApplicationId.from(TenantName.defaultName(),
                                                                          ApplicationName.from(APPLICATION_NAME),
                                                                          InstanceName.defaultName()),
-                                                      Tags.empty(),
                                                       "checksum",
                                                       APPLICATION_GENERATION,
                                                       0L);
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index 6507341670f..47e1b35291d 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -10,7 +10,6 @@ import com.yahoo.config.model.application.provider.DeployData;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.document.DataType;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
@@ -227,7 +226,6 @@ public class ApplicationDeployTest {
         ApplicationId applicationId = ApplicationId.from("tenant1", "application1", "instance1");
         DeployData deployData = new DeployData("bar",
                                                applicationId,
-                                               Tags.fromString("tag1 tag2"),
                                                13L,
                                                false,
                                                1337L,
@@ -238,7 +236,6 @@ public class ApplicationDeployTest {
         ApplicationMetaData meta = newApp.getMetaData();
         assertEquals("bar", meta.getDeployPath());
         assertEquals(applicationId, meta.getApplicationId());
-        assertEquals(Tags.fromString("tag1 tag2"), meta.getTags());
         assertEquals(13L, (long) meta.getDeployTimestamp());
         assertEquals(1337L, (long) meta.getGeneration());
         assertEquals(3L, meta.getPreviousActiveGeneration());
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 4dccebb98b9..b11355df689 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -23,7 +23,6 @@ import com.yahoo.config.provision.InfraDeployer;
 import com.yahoo.config.provision.Provisioner;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.config.provision.exception.ActivationConflictException;
@@ -364,7 +363,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     private PrepareResult deploy(File applicationDir, PrepareParams prepareParams, DeployHandlerLogger logger) {
         long sessionId = createSession(prepareParams.getApplicationId(),
-                                       prepareParams.tags(),
                                        prepareParams.getTimeoutBudget(),
                                        applicationDir,
                                        logger);
@@ -861,21 +859,21 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         return sessionRepository.createSessionFromExisting(fromSession, internalRedeploy, timeoutBudget, deployLogger).getSessionId();
     }
 
-    public long createSession(ApplicationId applicationId, Tags tags, TimeoutBudget timeoutBudget, InputStream in,
+    public long createSession(ApplicationId applicationId, TimeoutBudget timeoutBudget, InputStream in,
                               String contentType, DeployLogger logger) {
         File tempDir = uncheck(() -> Files.createTempDirectory("deploy")).toFile();
         long sessionId;
         try {
-            sessionId = createSession(applicationId, tags, timeoutBudget, decompressApplication(in, contentType, tempDir), logger);
+            sessionId = createSession(applicationId, timeoutBudget, decompressApplication(in, contentType, tempDir), logger);
         } finally {
             cleanupTempDirectory(tempDir, logger);
         }
         return sessionId;
     }
 
-    public long createSession(ApplicationId applicationId, Tags tags, TimeoutBudget timeoutBudget, File applicationDirectory, DeployLogger deployLogger) {
+    public long createSession(ApplicationId applicationId, TimeoutBudget timeoutBudget, File applicationDirectory, DeployLogger deployLogger) {
         SessionRepository sessionRepository = getTenant(applicationId).getSessionRepository();
-        Session session = sessionRepository.createSessionFromApplicationPackage(applicationDirectory, applicationId, tags, timeoutBudget, deployLogger);
+        Session session = sessionRepository.createSessionFromApplicationPackage(applicationDirectory, applicationId, timeoutBudget, deployLogger);
         return session.getSessionId();
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
index 71702e2926c..72f22aff7e2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
@@ -6,7 +6,6 @@ import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -64,7 +63,6 @@ public class SessionCreateHandler extends SessionHandler {
             // TODO: Avoid using application id here at all
             ApplicationId applicationId = ApplicationId.from(tenantName, ApplicationName.defaultName(), InstanceName.defaultName());
             sessionId = applicationRepository.createSession(applicationId,
-                                                            Tags.empty(),
                                                             timeoutBudget,
                                                             request.getData(),
                                                             request.getHeader(ApplicationApiHandler.contentTypeHeader),
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
index a7a22393771..239026249e5 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
@@ -10,7 +10,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.DockerImage;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.security.X509CertificateUtils;
@@ -42,7 +41,6 @@ public final class PrepareParams {
 
     static final String APPLICATION_NAME_PARAM_NAME = "applicationName";
     static final String INSTANCE_PARAM_NAME = "instance";
-    static final String TAGS_PARAM_NAME = "tags";
     static final String IGNORE_VALIDATION_PARAM_NAME = "ignoreValidationErrors";
     static final String DRY_RUN_PARAM_NAME = "dryRun";
     static final String VERBOSE_PARAM_NAME = "verbose";
@@ -59,7 +57,6 @@ public final class PrepareParams {
     static final String CLOUD_ACCOUNT = "cloudAccount";
 
     private final ApplicationId applicationId;
-    private final Tags tags;
     private final TimeoutBudget timeoutBudget;
     private final boolean ignoreValidationErrors;
     private final boolean dryRun;
@@ -78,7 +75,6 @@ public final class PrepareParams {
     private final Optional<CloudAccount> cloudAccount;
 
     private PrepareParams(ApplicationId applicationId,
-                          Tags tags,
                           TimeoutBudget timeoutBudget,
                           boolean ignoreValidationErrors,
                           boolean dryRun,
@@ -97,7 +93,6 @@ public final class PrepareParams {
                           Optional<CloudAccount> cloudAccount) {
         this.timeoutBudget = timeoutBudget;
         this.applicationId = Objects.requireNonNull(applicationId);
-        this.tags = tags;
         this.ignoreValidationErrors = ignoreValidationErrors;
         this.dryRun = dryRun;
         this.verbose = verbose;
@@ -124,7 +119,6 @@ public final class PrepareParams {
         private boolean force = false;
         private boolean waitForResourcesInPrepare = false;
         private ApplicationId applicationId = null;
-        private Tags tags = Tags.empty();
         private TimeoutBudget timeoutBudget = new TimeoutBudget(Clock.systemUTC(), Duration.ofSeconds(60));
         private Optional<Version> vespaVersion = Optional.empty();
         private List<ContainerEndpoint> containerEndpoints = null;
@@ -143,11 +137,6 @@ public final class PrepareParams {
             return this;
         }
 
-        public Builder tags(Tags tags) {
-            this.tags = tags;
-            return this;
-        }
-
         public Builder ignoreValidationErrors(boolean ignoreValidationErrors) {
             this.ignoreValidationErrors = ignoreValidationErrors;
             return this;
@@ -279,7 +268,6 @@ public final class PrepareParams {
 
         public PrepareParams build() {
             return new PrepareParams(applicationId,
-                                     tags,
                                      timeoutBudget,
                                      ignoreValidationErrors,
                                      dryRun,
@@ -306,7 +294,6 @@ public final class PrepareParams {
                             .verbose(request.getBooleanProperty(VERBOSE_PARAM_NAME))
                             .timeoutBudget(SessionHandler.getTimeoutBudget(request, barrierTimeout))
                             .applicationId(createApplicationId(request, tenant))
-                            .tags(Tags.fromString(request.getProperty(TAGS_PARAM_NAME)))
                             .vespaVersion(request.getProperty(VESPA_VERSION_PARAM_NAME))
                             .containerEndpoints(request.getProperty(CONTAINER_ENDPOINTS_PARAM_NAME))
                             .endpointCertificateMetadata(request.getProperty(ENDPOINT_CERTIFICATE_METADATA_PARAM_NAME))
@@ -329,7 +316,6 @@ public final class PrepareParams {
                 .verbose(booleanValue(params, VERBOSE_PARAM_NAME))
                 .timeoutBudget(SessionHandler.getTimeoutBudget(getTimeout(params, barrierTimeout)))
                 .applicationId(createApplicationId(params, tenant))
-                .tags(Tags.fromString(params.field(TAGS_PARAM_NAME).asString()))
                 .vespaVersion(SlimeUtils.optionalString(params.field(VESPA_VERSION_PARAM_NAME)).orElse(null))
                 .containerEndpointList(deserialize(params.field(CONTAINER_ENDPOINTS_PARAM_NAME), ContainerEndpointSerializer::endpointListFromSlime, List.of()))
                 .endpointCertificateMetadata(deserialize(params.field(ENDPOINT_CERTIFICATE_METADATA_PARAM_NAME), EndpointCertificateMetadataSerializer::fromSlime))
@@ -404,8 +390,6 @@ public final class PrepareParams {
 
     public ApplicationId getApplicationId() { return applicationId; }
 
-    public Tags tags() { return tags; }
-
     /** Returns the Vespa version the nodes running the prepared system should have, or empty to use the system version */
     public Optional<Version> vespaVersion() { return vespaVersion; }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
index 835381b316d..94b3bd96620 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
@@ -13,7 +13,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.DockerImage;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.path.Path;
 import com.yahoo.transaction.Transaction;
@@ -120,10 +119,6 @@ public abstract class Session implements Comparable<Session>  {
         sessionZooKeeperClient.writeApplicationId(applicationId);
     }
 
-    public void setTags(Tags tags) {
-        sessionZooKeeperClient.writeTags(tags);
-    }
-
     void setApplicationPackageReference(FileReference applicationPackageReference) {
         sessionZooKeeperClient.writeApplicationPackageReference(Optional.ofNullable(applicationPackageReference));
     }
@@ -159,10 +154,6 @@ public abstract class Session implements Comparable<Session>  {
     /** Returns application id read from ZooKeeper. Will throw RuntimeException if not found */
     public ApplicationId getApplicationId() { return sessionZooKeeperClient.readApplicationId(); }
 
-    public Tags getTags() {
-        return sessionZooKeeperClient.readTags();
-    }
-
     /** Returns application id read from ZooKeeper. Will return Optional.empty() if not found */
     public Optional<ApplicationId> getOptionalApplicationId() {
         try {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 7629fdd8bfd..17a019067a3 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -159,7 +159,6 @@ public class SessionPreparer {
         final PrepareParams params;
 
         final ApplicationId applicationId;
-        final Tags tags;
 
         /** The repository part of docker image to be used for this deployment */
         final Optional<DockerImage> dockerImageRepository;
@@ -191,7 +190,6 @@ public class SessionPreparer {
             this.applicationPackage = applicationPackage;
             this.sessionZooKeeperClient = sessionZooKeeperClient;
             this.applicationId = params.getApplicationId();
-            this.tags = params.tags();
             this.dockerImageRepository = params.dockerImageRepository();
             this.vespaVersion = params.vespaVersion().orElse(Vtag.currentVersion);
             this.containerEndpointsCache = new ContainerEndpointsCache(tenantPath, curator);
@@ -357,7 +355,6 @@ public class SessionPreparer {
             writeStateToZooKeeper(sessionZooKeeperClient,
                                   preprocessedApplicationPackage,
                                   applicationId,
-                                  tags,
                                   filereference,
                                   dockerImageRepository,
                                   vespaVersion,
@@ -399,7 +396,6 @@ public class SessionPreparer {
     private void writeStateToZooKeeper(SessionZooKeeperClient zooKeeperClient,
                                        ApplicationPackage applicationPackage,
                                        ApplicationId applicationId,
-                                       Tags tags,
                                        FileReference fileReference,
                                        Optional<DockerImage> dockerImageRepository,
                                        Version vespaVersion,
@@ -416,7 +412,6 @@ public class SessionPreparer {
             zkDeployer.deploy(applicationPackage, fileRegistryMap, allocatedHosts);
             // Note: When changing the below you need to also change similar calls in SessionRepository.createSessionFromExisting()
             zooKeeperClient.writeApplicationId(applicationId);
-            zooKeeperClient.writeTags(tags);
             zooKeeperClient.writeApplicationPackageReference(Optional.of(fileReference));
             zooKeeperClient.writeVespaVersion(vespaVersion);
             zooKeeperClient.writeDockerImageRepository(dockerImageRepository);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index d26173b4dd7..306b24a3c69 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -265,17 +265,14 @@ public class SessionRepository {
                                                   TimeoutBudget timeoutBudget,
                                                   DeployLogger deployLogger) {
         ApplicationId existingApplicationId = existingSession.getApplicationId();
-        Tags existingTags = existingSession.getTags();
         File existingApp = getSessionAppDir(existingSession.getSessionId());
         LocalSession session = createSessionFromApplication(existingApp,
                                                             existingApplicationId,
-                                                            existingTags,
                                                             internalRedeploy,
                                                             timeoutBudget,
                                                             deployLogger);
         // Note: Setters below need to be kept in sync with calls in SessionPreparer.writeStateToZooKeeper()
         session.setApplicationId(existingApplicationId);
-        session.setTags(existingTags);
         session.setApplicationPackageReference(existingSession.getApplicationPackageReference());
         session.setVespaVersion(existingSession.getVespaVersion());
         session.setDockerImageRepository(existingSession.getDockerImageRepository());
@@ -297,20 +294,19 @@ public class SessionRepository {
      */
     public LocalSession createSessionFromApplicationPackage(File applicationDirectory,
                                                             ApplicationId applicationId,
-                                                            Tags tags,
                                                             TimeoutBudget timeoutBudget,
                                                             DeployLogger deployLogger) {
         applicationRepo.createApplication(applicationId);
-        return createSessionFromApplication(applicationDirectory, applicationId, tags, false, timeoutBudget, deployLogger);
+        return createSessionFromApplication(applicationDirectory, applicationId, false, timeoutBudget, deployLogger);
     }
 
     /**
      * Creates a local session based on a remote session and the distributed application package.
      * Does not wait for session being created on other servers.
      */
-    private void createLocalSession(File applicationFile, ApplicationId applicationId, Tags tags, long sessionId) {
+    private void createLocalSession(File applicationFile, ApplicationId applicationId, long sessionId) {
         try {
-            ApplicationPackage applicationPackage = createApplicationPackage(applicationFile, applicationId, tags, sessionId, false, Optional.empty());
+            ApplicationPackage applicationPackage = createApplicationPackage(applicationFile, applicationId, sessionId, false, Optional.empty());
             createLocalSession(sessionId, applicationPackage);
         } catch (Exception e) {
             throw new RuntimeException("Error creating session " + sessionId, e);
@@ -686,13 +682,12 @@ public class SessionRepository {
     private ApplicationPackage createApplication(File userDir,
                                                  File configApplicationDir,
                                                  ApplicationId applicationId,
-                                                 Tags tags,
                                                  long sessionId,
                                                  Optional<Long> currentlyActiveSessionId,
                                                  boolean internalRedeploy,
                                                  Optional<DeployLogger> deployLogger) {
         long deployTimestamp = System.currentTimeMillis();
-        DeployData deployData = new DeployData(userDir.getAbsolutePath(), applicationId, tags, deployTimestamp, internalRedeploy,
+        DeployData deployData = new DeployData(userDir.getAbsolutePath(), applicationId, deployTimestamp, internalRedeploy,
                                                sessionId, currentlyActiveSessionId.orElse(nonExistingActiveSessionId));
         FilesApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(configApplicationDir, deployData);
         validateFileExtensions(applicationId, deployLogger, app);
@@ -720,14 +715,13 @@ public class SessionRepository {
 
     private LocalSession createSessionFromApplication(File applicationDirectory,
                                                       ApplicationId applicationId,
-                                                      Tags tags,
                                                       boolean internalRedeploy,
                                                       TimeoutBudget timeoutBudget,
                                                       DeployLogger deployLogger) {
         long sessionId = getNextSessionId();
         try {
             ensureSessionPathDoesNotExist(sessionId);
-            ApplicationPackage app = createApplicationPackage(applicationDirectory, applicationId, tags, sessionId, internalRedeploy, Optional.of(deployLogger));
+            ApplicationPackage app = createApplicationPackage(applicationDirectory, applicationId, sessionId, internalRedeploy, Optional.of(deployLogger));
             log.log(Level.FINE, () -> TenantRepository.logPre(tenantName) + "Creating session " + sessionId + " in ZooKeeper");
             SessionZooKeeperClient sessionZKClient = createSessionZooKeeperClient(sessionId);
             sessionZKClient.createNewSession(clock.instant());
@@ -743,7 +737,6 @@ public class SessionRepository {
 
     private ApplicationPackage createApplicationPackage(File applicationDirectory,
                                                         ApplicationId applicationId,
-                                                        Tags tags,
                                                         long sessionId,
                                                         boolean internalRedeploy,
                                                         Optional<DeployLogger> deployLogger) throws IOException {
@@ -756,7 +749,6 @@ public class SessionRepository {
             ApplicationPackage applicationPackage = createApplication(applicationDirectory,
                                                                       userApplicationDir,
                                                                       applicationId,
-                                                                      tags,
                                                                       sessionId,
                                                                       activeSessionId,
                                                                       internalRedeploy,
@@ -875,7 +867,7 @@ public class SessionRepository {
         }
         ApplicationId applicationId = sessionZKClient.readApplicationId();
         log.log(Level.FINE, () -> "Creating local session for tenant '" + tenantName + "' with session id " + sessionId);
-        createLocalSession(sessionDir, applicationId, sessionZKClient.readTags(), sessionId);
+        createLocalSession(sessionDir, applicationId, sessionId);
     }
 
     private Optional<Long> getActiveSessionId(ApplicationId applicationId) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index 2353c480a34..4bbb8a63974 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -14,7 +14,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.AthenzDomain;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.DockerImage;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.path.Path;
 import com.yahoo.slime.SlimeUtils;
@@ -59,7 +58,6 @@ public class SessionZooKeeperClient {
     // NOTE: Any state added here MUST also be propagated in com.yahoo.vespa.config.server.deploy.Deployment.prepare()
 
     static final String APPLICATION_ID_PATH = "applicationId";
-    static final String TAGS_PATH = "tags";
     static final String APPLICATION_PACKAGE_REFERENCE_PATH = "applicationPackageReference";
     private static final String VERSION_PATH = "version";
     private static final String CREATE_TIME_PATH = "createTime";
@@ -175,20 +173,6 @@ public class SessionZooKeeperClient {
                       .orElseThrow(() -> new NotFoundException("Could not find application id for session " + sessionId));
     }
 
-    private Path tagsPath() {
-        return sessionPath.append(TAGS_PATH);
-    }
-
-    public void writeTags(Tags tags) {
-        curator.set(tagsPath(), Utf8.toBytes(tags.asString()));
-    }
-
-    public Tags readTags() {
-        Optional<byte[]> data = curator.getData(tagsPath());
-        if (data.isEmpty()) return Tags.empty();
-        return Tags.fromString(Utf8.toString(data.get()));
-    }
-
     void writeApplicationPackageReference(Optional<FileReference> applicationPackageReference) {
         applicationPackageReference.ifPresent(
                 reference -> curator.set(applicationPackageReferencePath(), Utf8.toBytes(reference.value())));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 8f104a27000..76eb61ed141 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -17,7 +17,6 @@ import com.yahoo.config.provision.HostFilter;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.NetworkPorts;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.exception.ActivationConflictException;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -846,7 +845,7 @@ public class ApplicationRepositoryTest {
     }
 
     private long createSession(ApplicationId applicationId, TimeoutBudget timeoutBudget, File app) {
-        return applicationRepository.createSession(applicationId, Tags.empty(), timeoutBudget, app, new BaseDeployLogger());
+        return applicationRepository.createSession(applicationId, timeoutBudget, app, new BaseDeployLogger());
     }
 
     private long createSessionFromExisting(ApplicationId applicationId, TimeoutBudget timeoutBudget) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
index 653753c97e7..fd6440a9632 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClientTest.java
@@ -13,7 +13,6 @@ import com.yahoo.config.model.application.provider.MockFileRegistry;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.HostSpec;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.path.Path;
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.server.zookeeper.ZKApplicationPackage;
@@ -60,7 +59,6 @@ public class ZooKeeperClientTest {
         ApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(new File("src/test/apps/zkfeed"),
                                                                                 new DeployData("/bar/baz",
                                                                                                ApplicationId.from("default", "appName", "default"),
-                                                                                               Tags.fromString("tag1 tag2"),
                                                                                                1345L,
                                                                                                true,
                                                                                                3L,
@@ -123,7 +121,6 @@ public class ZooKeeperClientTest {
         assertTrue(metaData.getChecksum().length() > 0);
         assertTrue(metaData.isInternalRedeploy());
         assertEquals("/bar/baz", metaData.getDeployPath());
-        assertEquals(Tags.fromString("tag1 tag2"), metaData.getTags());
         assertEquals(1345, metaData.getDeployTimestamp().longValue());
         assertEquals(3, metaData.getGeneration().longValue());
         assertEquals(2, metaData.getPreviousActiveGeneration());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index 816f7e3dcec..1c71ef0b7fb 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -6,7 +6,6 @@ import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ApplicationMetaData;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -132,7 +131,6 @@ public class SessionActiveHandlerTest {
 
         void invoke() {
             long sessionId = applicationRepository.createSession(applicationId(),
-                                                                 Tags.empty(),
                                                                  new TimeoutBudget(clock, Duration.ofSeconds(10)),
                                                                  testApp,
                                                                  new BaseDeployLogger());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
index 525a969ed1e..de6073bb1ea 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
@@ -10,7 +10,6 @@ import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.NodeAllocationException;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.jdisc.http.HttpRequest;
@@ -325,7 +324,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     }
 
     private long createSession(ApplicationId applicationId) {
-        return applicationRepository.createSession(applicationId, Tags.empty(), timeoutBudget, app, new BaseDeployLogger());
+        return applicationRepository.createSession(applicationId, timeoutBudget, app, new BaseDeployLogger());
     }
 
     private static class FailingSessionPrepareHandler extends SessionPrepareHandler {
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 82d6f183761..2c898b8bf7d 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
@@ -7,7 +7,6 @@ import com.yahoo.config.model.api.EndpointCertificateMetadata;
 import com.yahoo.config.model.api.TenantSecretStore;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.CloudAccount;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 
@@ -63,7 +62,6 @@ public class PrepareParamsTest {
         PrepareParams prepareParams = createParams("http://foo:19071/application/v2/", TenantName.defaultName());
 
         assertEquals(ApplicationId.defaultId(), prepareParams.getApplicationId());
-        assertTrue(prepareParams.tags().isEmpty());
         assertFalse(prepareParams.isDryRun());
         assertFalse(prepareParams.isVerbose());
         assertFalse(prepareParams.ignoreValidationErrors());
@@ -74,18 +72,6 @@ public class PrepareParamsTest {
     }
 
     @Test
-    public void testTagsParsing() throws IOException {
-        var prepareParams = createParams(request + "&" + PrepareParams.TAGS_PARAM_NAME + "=tag1%20tag2", TenantName.from("foo"));
-        assertEquals(Tags.fromString("tag1 tag2"), prepareParams.tags());
-
-        // Verify using json object
-        var slime = SlimeUtils.jsonToSlime(json);
-        slime.get().setString(PrepareParams.TAGS_PARAM_NAME, "tag1 tag2");
-        PrepareParams prepareParamsJson = PrepareParams.fromJson(SlimeUtils.toJsonBytes(slime), TenantName.from("foo"), Duration.ofSeconds(60));
-        assertPrepareParamsEqual(prepareParams, prepareParamsJson);
-    }
-
-    @Test
     public void testCorrectParsingWithContainerEndpoints() throws IOException {
         var endpoints = List.of(new ContainerEndpoint("qrs1", ApplicationClusterEndpoint.Scope.global,
                                                       List.of("c1.example.com",
@@ -221,7 +207,6 @@ public class PrepareParamsTest {
         assertEquals(urlParams.force(), jsonParams.force());
         assertEquals(urlParams.waitForResourcesInPrepare(), jsonParams.waitForResourcesInPrepare());
         assertEquals(urlParams.getApplicationId(), jsonParams.getApplicationId());
-        assertEquals(urlParams.tags(), jsonParams.tags());
         assertEquals(urlParams.getTimeoutBudget().timeout(), jsonParams.getTimeoutBudget().timeout());
         assertEquals(urlParams.vespaVersion(), jsonParams.vespaVersion());
         assertEquals(urlParams.containerEndpoints(), jsonParams.containerEndpoints());
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
index 63c744c385d..5a55768ad2c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/DeploymentData.java
@@ -5,7 +5,6 @@ import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.DockerImage;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.Quota;
@@ -32,7 +31,6 @@ import static java.util.Objects.requireNonNull;
 public class DeploymentData {
 
     private final ApplicationId instance;
-    private final Tags tags;
     private final ZoneId zone;
     private final Supplier<InputStream> applicationPackage;
     private final Version platform;
@@ -46,7 +44,7 @@ public class DeploymentData {
     private final Supplier<Optional<CloudAccount>> cloudAccount;
     private final boolean dryRun;
 
-    public DeploymentData(ApplicationId instance, Tags tags, ZoneId zone, Supplier<InputStream> applicationPackage, Version platform,
+    public DeploymentData(ApplicationId instance, ZoneId zone, Supplier<InputStream> applicationPackage, Version platform,
                           Set<ContainerEndpoint> containerEndpoints,
                           Supplier<Optional<EndpointCertificateMetadata>> endpointCertificateMetadata,
                           Optional<DockerImage> dockerImageRepo,
@@ -57,7 +55,6 @@ public class DeploymentData {
                           Supplier<Optional<CloudAccount>> cloudAccount,
                           boolean dryRun) {
         this.instance = requireNonNull(instance);
-        this.tags = requireNonNull(tags);
         this.zone = requireNonNull(zone);
         this.applicationPackage = requireNonNull(applicationPackage);
         this.platform = requireNonNull(platform);
@@ -76,8 +73,6 @@ public class DeploymentData {
         return instance;
     }
 
-    public Tags tags() { return tags; }
-
     public ZoneId zone() {
         return zone;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 28673cdc1d2..03fb433bacf 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -12,7 +12,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.text.Text;
@@ -175,9 +174,7 @@ public class ApplicationController {
                 lockApplicationIfPresent(id, application -> {
                     for (var declaredInstance : application.get().deploymentSpec().instances())
                         if ( ! application.get().instances().containsKey(declaredInstance.name()))
-                            application = withNewInstance(application,
-                                                          id.instance(declaredInstance.name()),
-                                                          declaredInstance.tags());
+                            application = withNewInstance(application, id.instance(declaredInstance.name()));
                     store(application);
                 });
                 count++;
@@ -459,14 +456,14 @@ public class ApplicationController {
      *
      * @throws IllegalArgumentException if the instance already exists, or has an invalid instance name.
      */
-    public void createInstance(ApplicationId id, Tags tags) {
+    public void createInstance(ApplicationId id) {
         lockApplicationOrThrow(TenantAndApplicationId.from(id), application -> {
-            store(withNewInstance(application, id, tags));
+            store(withNewInstance(application, id));
         });
     }
 
     /** Returns given application with a new instance */
-    public LockedApplication withNewInstance(LockedApplication application, ApplicationId instance, Tags tags) {
+    public LockedApplication withNewInstance(LockedApplication application, ApplicationId instance) {
         if (instance.instance().isTester())
             throw new IllegalArgumentException("'" + instance + "' is a tester application!");
         InstanceId.validate(instance.instance().value());
@@ -477,7 +474,7 @@ public class ApplicationController {
             throw new IllegalArgumentException("Could not create '" + instance + "': Instance " + dashToUnderscore(instance) + " already exists");
 
         log.info("Created " + instance);
-        return application.withNewInstance(instance.instance(), tags);
+        return application.withNewInstance(instance.instance());
     }
 
     /** Deploys an application package for an existing application instance. */
@@ -520,7 +517,7 @@ public class ApplicationController {
             };
 
             // Carry out deployment without holding the application lock.
-            DeploymentResult result = deploy(job.application(), instance.tags(), applicationPackage, zone, platform, containerEndpoints,
+            DeploymentResult result = deploy(job.application(), applicationPackage, zone, platform, containerEndpoints,
                                              endpointCertificateMetadata, run.isDryRun(), run.testerCertificate());
 
 
@@ -569,9 +566,7 @@ public class ApplicationController {
         var declaredInstances = applicationPackage.deploymentSpec().instances();
         for (var declaredInstance : declaredInstances) {
             if ( ! existingInstances.containsKey(declaredInstance.name()))
-                application = withNewInstance(application, application.get().id().instance(declaredInstance.name()), declaredInstance.tags());
-            else if ( ! existingInstances.get(declaredInstance.name()).tags().equals(declaredInstance.tags()))
-                application = application.with(declaredInstance.name(), instance -> instance.with(declaredInstance.tags()));
+                application = withNewInstance(application, application.get().id().instance(declaredInstance.name()));
         }
 
         // Delete zones not listed in DeploymentSpec, if allowed
@@ -610,7 +605,7 @@ public class ApplicationController {
             ApplicationPackageStream applicationPackage = new ApplicationPackageStream(
                     () -> new ByteArrayInputStream(artifactRepository.getSystemApplicationPackage(application.id(), zone, version))
             );
-            return deploy(application.id(), Tags.empty(), applicationPackage, zone, version, Set.of(), Optional::empty, false, Optional.empty());
+            return deploy(application.id(), applicationPackage, zone, version, Set.of(), Optional::empty, false, Optional.empty());
         } else {
            throw new RuntimeException("This system application does not have an application package: " + application.id().toShortString());
         }
@@ -618,10 +613,10 @@ public class ApplicationController {
 
     /** Deploys the given tester application to the given zone. */
     public DeploymentResult deployTester(TesterId tester, ApplicationPackageStream applicationPackage, ZoneId zone, Version platform) {
-        return deploy(tester.id(), Tags.empty(), applicationPackage, zone, platform, Set.of(), Optional::empty, false, Optional.empty());
+        return deploy(tester.id(), applicationPackage, zone, platform, Set.of(), Optional::empty, false, Optional.empty());
     }
 
-    private DeploymentResult deploy(ApplicationId application, Tags tags, ApplicationPackageStream applicationPackage,
+    private DeploymentResult deploy(ApplicationId application, ApplicationPackageStream applicationPackage,
                                     ZoneId zone, Version platform, Set<ContainerEndpoint> endpoints,
                                     Supplier<Optional<EndpointCertificateMetadata>> endpointCertificateMetadata,
                                     boolean dryRun, Optional<X509Certificate> testerCertificate) {
@@ -655,7 +650,7 @@ public class ApplicationController {
             }
             Supplier<Optional<CloudAccount>> cloudAccount = () -> decideCloudAccountOf(deployment, applicationPackage.truncatedPackage().deploymentSpec());
             ConfigServer.PreparedApplication preparedApplication =
-                    configServer.deploy(new DeploymentData(application, tags, zone, applicationPackage::zipStream, platform,
+                    configServer.deploy(new DeploymentData(application, zone, applicationPackage::zipStream, platform,
                                                            endpoints, endpointCertificateMetadata, dockerImageRepo, domain,
                                                            deploymentQuota, tenantSecretStores, operatorCertificates,
                                                            cloudAccount, dryRun));
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
index 430bafe5c44..d66d1491f73 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
@@ -5,7 +5,6 @@ import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.RevisionId;
@@ -41,7 +40,6 @@ import java.util.stream.Collectors;
 public class Instance {
 
     private final ApplicationId id;
-    private final Tags tags;
     private final Map<ZoneId, Deployment> deployments;
     private final List<AssignedRotation> rotations;
     private final RotationStatus rotationStatus;
@@ -49,15 +47,14 @@ public class Instance {
     private final Change change;
 
     /** Creates an empty instance */
-    public Instance(ApplicationId id, Tags tags) {
-        this(id, tags, Set.of(), Map.of(), List.of(), RotationStatus.EMPTY, Change.empty());
+    public Instance(ApplicationId id) {
+        this(id, Set.of(), Map.of(), List.of(), RotationStatus.EMPTY, Change.empty());
     }
 
     /** Creates an empty instance*/
-    public Instance(ApplicationId id, Tags tags, Collection<Deployment> deployments, Map<JobType, Instant> jobPauses,
+    public Instance(ApplicationId id, Collection<Deployment> deployments, Map<JobType, Instant> jobPauses,
                     List<AssignedRotation> rotations, RotationStatus rotationStatus, Change change) {
         this.id = Objects.requireNonNull(id, "id cannot be null");
-        this.tags = Objects.requireNonNull(tags, "tags cannot be null");
         this.deployments = Objects.requireNonNull(deployments, "deployments cannot be null").stream()
                                   .collect(Collectors.toUnmodifiableMap(Deployment::zone, Function.identity()));
         this.jobPauses = Map.copyOf(Objects.requireNonNull(jobPauses, "deploymentJobs cannot be null"));
@@ -66,10 +63,6 @@ public class Instance {
         this.change = Objects.requireNonNull(change, "change cannot be null");
     }
 
-    public Instance with(Tags tags) {
-        return new Instance(id, tags, deployments.values(), jobPauses, rotations, rotationStatus, change);
-    }
-
     public Instance withNewDeployment(ZoneId zone, RevisionId revision, Version version,
                                       Instant instant, Map<DeploymentMetrics.Warning, Integer> warnings, QuotaUsage quotaUsage) {
         // Use info from previous deployment if available, otherwise create a new one.
@@ -94,7 +87,7 @@ public class Instance {
         else
             jobPauses.remove(jobType);
 
-        return new Instance(id, tags, deployments.values(), jobPauses, rotations, rotationStatus, change);
+        return new Instance(id, deployments.values(), jobPauses, rotations, rotationStatus, change);
     }
 
     public Instance recordActivityAt(Instant instant, ZoneId zone) {
@@ -125,15 +118,15 @@ public class Instance {
     }
 
     public Instance with(List<AssignedRotation> assignedRotations) {
-        return new Instance(id, tags, deployments.values(), jobPauses, assignedRotations, rotationStatus, change);
+        return new Instance(id, deployments.values(), jobPauses, assignedRotations, rotationStatus, change);
     }
 
     public Instance with(RotationStatus rotationStatus) {
-        return new Instance(id, tags, deployments.values(), jobPauses, rotations, rotationStatus, change);
+        return new Instance(id, deployments.values(), jobPauses, rotations, rotationStatus, change);
     }
 
     public Instance withChange(Change change) {
-        return new Instance(id, tags, deployments.values(), jobPauses, rotations, rotationStatus, change);
+        return new Instance(id, deployments.values(), jobPauses, rotations, rotationStatus, change);
     }
 
     private Instance with(Deployment deployment) {
@@ -143,15 +136,13 @@ public class Instance {
     }
 
     private Instance with(Map<ZoneId, Deployment> deployments) {
-        return new Instance(id, tags, deployments.values(), jobPauses, rotations, rotationStatus, change);
+        return new Instance(id, deployments.values(), jobPauses, rotations, rotationStatus, change);
     }
 
     public ApplicationId id() { return id; }
 
     public InstanceName name() { return id.instance(); }
 
-    public Tags tags() { return tags; }
-
     /** Returns an immutable map of the current deployments of this */
     public Map<ZoneId, Deployment> deployments() { return deployments; }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
index fa702a166d2..b99c52d1533 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
@@ -4,9 +4,7 @@ package com.yahoo.vespa.hosted.controller;
 import com.yahoo.config.application.api.DeploymentSpec;
 import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.InstanceName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.transaction.Mutex;
-import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.User;
 import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId;
@@ -89,9 +87,9 @@ public class LockedApplication {
                                projectId, revisions, instances.values());
     }
 
-    LockedApplication withNewInstance(InstanceName instance, Tags tags) {
+    LockedApplication withNewInstance(InstanceName instance) {
         var instances = new HashMap<>(this.instances);
-        instances.put(instance, new Instance(id.instance(instance), tags));
+        instances.put(instance, new Instance(id.instance(instance)));
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides,
                                      deploymentIssueId, ownershipIssueId, owner, majorVersion, metrics, deployKeys,
                                      projectId, instances, revisions);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index f94bd51fe4c..db5acaddcf7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -7,7 +7,6 @@ import com.yahoo.component.VersionCompatibility;
 import com.yahoo.concurrent.UncheckedTimeoutException;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.transaction.Mutex;
 import com.yahoo.vespa.flags.FetchVector.Dimension;
@@ -708,7 +707,7 @@ public class JobController {
 
         controller.applications().lockApplicationOrThrow(TenantAndApplicationId.from(id), application -> {
             if ( ! application.get().instances().containsKey(id.instance()))
-                application = controller.applications().withNewInstance(application, id, Tags.empty());
+                application = controller.applications().withNewInstance(application, id);
             // TODO(mpolden): Enable for public CD once all tests have been updated
             if (controller.system() != SystemName.PublicCd) {
                 controller.applications().validatePackage(applicationPackage, application.get());
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
index 37c45f38e36..2a9724bb911 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
@@ -8,8 +8,6 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.security.KeyUtils;
 import com.yahoo.slime.ArrayTraverser;
@@ -98,7 +96,6 @@ public class ApplicationSerializer {
 
     // Instance fields
     private static final String instanceNameField = "instanceName";
-    private static final String tagsField = "tags";
     private static final String deploymentsField = "deployments";
     private static final String deploymentJobsField = "deploymentJobs"; // TODO jonmv: clean up serialisation format
     private static final String assignedRotationsField = "assignedRotations";
@@ -186,7 +183,6 @@ public class ApplicationSerializer {
         for (Instance instance : application.instances().values()) {
             Cursor instanceObject = array.addObject();
             instanceObject.setString(instanceNameField, instance.name().value());
-            instanceObject.setString(tagsField, instance.tags().asString());
             deploymentsToSlime(instance.deployments().values(), instanceObject.setArray(deploymentsField));
             toSlime(instance.jobPauses(), instanceObject.setObject(deploymentJobsField));
             assignedRotationsToSlime(instance.rotations(), instanceObject);
@@ -383,14 +379,12 @@ public class ApplicationSerializer {
         List<Instance> instances = new ArrayList<>();
         field.traverse((ArrayTraverser) (name, object) -> {
             InstanceName instanceName = InstanceName.from(object.field(instanceNameField).asString());
-            Tags tags = Tags.fromString(object.field(tagsField).asString());
             List < Deployment > deployments = deploymentsFromSlime(object.field(deploymentsField), id.instance(instanceName));
             Map<JobType, Instant> jobPauses = jobPausesFromSlime(object.field(deploymentJobsField));
             List<AssignedRotation> assignedRotations = assignedRotationsFromSlime(object);
             RotationStatus rotationStatus = rotationStatusFromSlime(object);
             Change change = changeFromSlime(object.field(deployingField));
             instances.add(new Instance(id.instance(instanceName),
-                                       tags,
                                        deployments,
                                        jobPauses,
                                        assignedRotations,
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 2d78667cb99..121c234725f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -22,7 +22,6 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.NodeResources;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
@@ -31,7 +30,6 @@ import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
 import com.yahoo.io.IOUtils;
-import com.yahoo.jdisc.Response;
 import com.yahoo.jdisc.http.filter.security.misc.User;
 import com.yahoo.restapi.ByteArrayResponse;
 import com.yahoo.restapi.ErrorResponse;
@@ -2129,7 +2127,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         if (controller.applications().getApplication(applicationId).isEmpty())
             createApplication(tenantName, applicationName, request);
 
-        controller.applications().createInstance(applicationId.instance(instanceName), Tags.empty());
+        controller.applications().createInstance(applicationId.instance(instanceName));
 
         Slime slime = new Slime();
         toSlime(applicationId.instance(instanceName), slime.setObject(), request);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 8fdff787420..95b81dffaed 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -15,7 +15,6 @@ import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
@@ -1406,7 +1405,7 @@ public class ControllerTest {
     void testDeactivateDeploymentUnknownByController() {
         DeploymentContext context = tester.newDeploymentContext();
         DeploymentId deployment = context.deploymentIdIn(ZoneId.from("prod", "us-west-1"));
-        DeploymentData deploymentData = new DeploymentData(deployment.applicationId(), Tags.empty(), deployment.zoneId(), InputStream::nullInputStream, Version.fromString("6.1"),
+        DeploymentData deploymentData = new DeploymentData(deployment.applicationId(), deployment.zoneId(), InputStream::nullInputStream, Version.fromString("6.1"),
                                                            Set.of(), Optional::empty, Optional.empty(), Optional.empty(),
                                                            Quota::unlimited, List.of(), List.of(), Optional::empty, false);
         tester.configServer().deploy(deploymentData);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
index 38a4945e354..43a85aa6aca 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
@@ -7,7 +7,6 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneApi;
@@ -371,7 +370,7 @@ public final class ControllerTester {
 
     public Application createApplication(String tenant, String applicationName, String instanceName) {
         Application application = createApplication(tenant, applicationName);
-        controller().applications().createInstance(application.id().instance(instanceName), Tags.empty());
+        controller().applications().createInstance(application.id().instance(instanceName));
         return application;
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java
index ff0bc4c8876..a199ef9e34e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java
@@ -8,7 +8,6 @@ import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.Instance;
@@ -38,23 +37,24 @@ public class DeploymentQuotaCalculatorTest {
     void quota_is_divided_among_prod_instances() {
         Quota calculated = DeploymentQuotaCalculator.calculate(Quota.unlimited().withBudget(10), List.of(), ApplicationId.defaultId(), ZoneId.defaultId(),
                 DeploymentSpec.fromXml(
-                        "<deployment version='1.0'>\n" +
-                                "  <instance id='instance1'> \n" +
-                                "    <test />\n" +
-                                "    <staging />\n" +
-                                "    <prod>\n" +
-                                "      <region active=\"true\">us-east-1</region>\n" +
-                                "      <region active=\"false\">us-west-1</region>\n" +
-                                "    </prod>\n" +
-                                "  </instance>\n" +
-                                "  <instance id='instance2'>\n" +
-                                "    <perf/>\n" +
-                                "    <dev/>\n" +
-                                "    <prod>\n" +
-                                "      <region active=\"true\">us-north-1</region>\n" +
-                                "    </prod>\n" +
-                                "  </instance>\n" +
-                                "</deployment>"));
+                        """
+                        <deployment version='1.0'>
+                          <instance id='instance1'>\s
+                            <test />
+                            <staging />
+                            <prod>
+                              <region active="true">us-east-1</region>
+                              <region active="false">us-west-1</region>
+                            </prod>
+                          </instance>
+                          <instance id='instance2'>
+                            <perf/>
+                            <dev/>
+                            <prod>
+                              <region active="true">us-north-1</region>
+                            </prod>
+                          </instance>
+                        </deployment>"""));
         assertEquals(10d / 3, calculated.budget().orElseThrow().doubleValue(), 1e-5);
     }
 
@@ -63,23 +63,24 @@ public class DeploymentQuotaCalculatorTest {
 
         var existing_dev_deployment = new Application(TenantAndApplicationId.from(ApplicationId.defaultId()), Instant.EPOCH, DeploymentSpec.empty, ValidationOverrides.empty, Optional.empty(),
                 Optional.empty(), Optional.empty(), OptionalInt.empty(), new ApplicationMetrics(1, 1), Set.of(), OptionalLong.empty(), RevisionHistory.empty(),
-                List.of(new Instance(ApplicationId.defaultId(), Tags.empty()).withNewDeployment(ZoneId.from(Environment.dev, RegionName.defaultName()),
+                List.of(new Instance(ApplicationId.defaultId()).withNewDeployment(ZoneId.from(Environment.dev, RegionName.defaultName()),
                                                                                          RevisionId.forProduction(1), Version.emptyVersion, Instant.EPOCH, Map.of(), QuotaUsage.create(0.53d))));
 
         Quota calculated = DeploymentQuotaCalculator.calculate(Quota.unlimited().withBudget(2), List.of(existing_dev_deployment), ApplicationId.defaultId(), ZoneId.defaultId(),
                 DeploymentSpec.fromXml(
-                        "<deployment version='1.0'>\n" +
-                                "  <instance id='default'> \n" +
-                                "    <test />\n" +
-                                "    <staging />\n" +
-                                "    <prod>\n" +
-                                "      <region active=\"true\">us-east-1</region>\n" +
-                                "      <region active=\"false\">us-west-1</region>\n" +
-                                "      <region active=\"true\">us-north-1</region>\n" +
-                                "      <region active=\"true\">us-south-1</region>\n" +
-                                "    </prod>\n" +
-                                "  </instance>\n" +
-                                "</deployment>"));
+                        """
+                        <deployment version='1.0'>
+                          <instance id='default'>\s
+                            <test />
+                            <staging />
+                            <prod>
+                              <region active="true">us-east-1</region>
+                              <region active="false">us-west-1</region>
+                              <region active="true">us-north-1</region>
+                              <region active="true">us-south-1</region>
+                            </prod>
+                          </instance>
+                        </deployment>"""));
         assertEquals((2d - 0.53d) / 4d, calculated.budget().orElseThrow().doubleValue(), 1e-5);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java
index d79a81c7746..8a8500448d8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java
@@ -9,7 +9,6 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.RoutingMethod;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.security.KeyAlgorithm;
@@ -105,7 +104,7 @@ public class EndpointCertificatesTest {
         return x509CertificateBuilder.build();
     }
 
-    private final Instance testInstance = new Instance(ApplicationId.defaultId(), Tags.empty());
+    private final Instance testInstance = new Instance(ApplicationId.defaultId());
     private final String testKeyName = "testKeyName";
     private final String testCertName = "testCertName";
     private ZoneId testZone;
@@ -245,7 +244,7 @@ public class EndpointCertificatesTest {
 
     @Test
     void includes_application_endpoint_when_declared() {
-        Instance instance = new Instance(ApplicationId.from("t1", "a1", "default"), Tags.empty());
+        Instance instance = new Instance(ApplicationId.from("t1", "a1", "default"));
         ZoneId zone1 = ZoneId.from(Environment.prod, RegionName.from("aws-us-east-1c"));
         ZoneId zone2 = ZoneId.from(Environment.prod, RegionName.from("aws-us-west-2a"));
         ControllerTester tester = publicTester();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index 13540246078..f95c38f9d63 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -996,7 +996,7 @@ public class DeploymentTriggerTest {
     @Test
     void testUserInstancesNotInDeploymentSpec() {
         var app = tester.newDeploymentContext();
-        tester.controller().applications().createInstance(app.application().id().instance("user"), Tags.empty());
+        tester.controller().applications().createInstance(app.application().id().instance("user"));
         app.submit().deploy();
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
index 04a623f819b..faef6de94ca 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java
@@ -7,7 +7,6 @@ import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.security.KeyUtils;
 import com.yahoo.slime.SlimeUtils;
@@ -133,14 +132,12 @@ public class ApplicationSerializerTest {
                 Map.of(new JobId(id1, DeploymentContext.productionUsEast3), List.of(applicationVersion2)));
         List<Instance> instances =
                 List.of(new Instance(id1,
-                                     Tags.fromString("tag1 tag2"),
                                      deployments,
                                      Map.of(DeploymentContext.systemTest, Instant.ofEpochMilli(333)),
                                      List.of(rotation("foo", "default", "my-rotation", Set.of("us-west-1"))),
                                      rotationStatus,
                                      Change.of(new Version("6.1"))),
                         new Instance(id3,
-                                     Tags.empty(),
                                      List.of(),
                                      Map.of(),
                                      List.of(),
@@ -184,9 +181,6 @@ public class ApplicationSerializerTest {
         assertEquals(original.revisions().production(), serialized.revisions().production());
         assertEquals(original.revisions().development(), serialized.revisions().development());
 
-        assertEquals(original.require(id1.instance()).tags(), serialized.require(id1.instance()).tags());
-        assertEquals(original.require(id3.instance()).tags(), serialized.require(id3.instance()).tags());
-
         assertEquals(original.deploymentSpec().xmlForm(), serialized.deploymentSpec().xmlForm());
         assertEquals(original.validationOverrides().xmlForm(), serialized.validationOverrides().xmlForm());
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiTest.java
index 2f4b4154c08..3a539987443 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/athenz/AthenzApiTest.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.restapi.athenz;
 
 import com.yahoo.application.container.handler.Request;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.Tags;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.restapi.ContainerTester;
@@ -26,8 +25,8 @@ public class AthenzApiTest extends ControllerContainerTest {
 
         controllerTester.createTenant("sandbox", AthenzApiHandler.sandboxDomainIn(tester.controller().system()), 123L);
         controllerTester.createApplication("sandbox", "app", "default");
-        tester.controller().applications().createInstance(ApplicationId.from("sandbox", "app", hostedOperator.getName()), Tags.empty());
-        tester.controller().applications().createInstance(ApplicationId.from("sandbox", "app", defaultUser.getName()), Tags.empty());
+        tester.controller().applications().createInstance(ApplicationId.from("sandbox", "app", hostedOperator.getName()));
+        tester.controller().applications().createInstance(ApplicationId.from("sandbox", "app", defaultUser.getName()));
         controllerTester.createApplication("sandbox", "opp", "default");
 
         controllerTester.createTenant("tenant1", "domain1", 123L);