diff --git a/src/InfrastructureCli/Services/AwsCloudFormationService.cs b/src/InfrastructureCli/Services/AwsCloudFormationService.cs
index ba9820b..0e6f806 100644
--- a/src/InfrastructureCli/Services/AwsCloudFormationService.cs
+++ b/src/InfrastructureCli/Services/AwsCloudFormationService.cs
@@ -497,16 +497,19 @@ private async Task<bool> CreateStackWithChangeSet(DeployOptions deployOptions)
 
         ChangeSetType changeSetType;
         List<ResourceToImport>? resourcesToImport;
+        List<Tag>? tags;
         
         if (deployOptions.Options.TryGetValue("ResourcesToImport", out var resourcesToImportJson))
         {
             changeSetType = ChangeSetType.IMPORT;
             resourcesToImport = JsonSerializer.Deserialize<List<ResourceToImport>>(resourcesToImportJson);
+            tags = null;
         }
         else
         {
             changeSetType = ChangeSetType.CREATE;
             resourcesToImport = null;
+            tags = GetTags();
         }
         
         var request = new CreateChangeSetRequest
@@ -516,7 +519,7 @@ private async Task<bool> CreateStackWithChangeSet(DeployOptions deployOptions)
             ChangeSetName = changeSetName,
             StackName = GetStackName(),
             Capabilities = GetCapabilities(),
-            Tags = GetTags(),
+            Tags = tags,
             TemplateBody = GetTemplateBody(deployOptions.Template),
             Parameters = await GetParameters(deployOptions.Parameters)
         };