diff --git a/ecs/pkg/amazon/backend/cloudformation.go b/ecs/pkg/amazon/backend/cloudformation.go
index 2d85a8a7..2c6d4bc5 100644
--- a/ecs/pkg/amazon/backend/cloudformation.go
+++ b/ecs/pkg/amazon/backend/cloudformation.go
@@ -179,6 +179,7 @@ func (b Backend) Convert(project *types.Project) (*cloudformation.Template, erro
 					},
 				},
 			},
+			PropagateTags:      ecsapi.PropagateTagsService,
 			SchedulingStrategy: ecsapi.SchedulingStrategyReplica,
 			ServiceRegistries:  []ecs.Service_ServiceRegistry{serviceRegistry},
 			Tags: []tags.Tag{
diff --git a/ecs/pkg/amazon/backend/convert.go b/ecs/pkg/amazon/backend/convert.go
index 4470e116..b4ae15ae 100644
--- a/ecs/pkg/amazon/backend/convert.go
+++ b/ecs/pkg/amazon/backend/convert.go
@@ -37,29 +37,13 @@ func Convert(project *types.Project, service types.ServiceConfig) (*ecs.TaskDefi
 			fmt.Sprintf(" %s.local", project.Name),
 		}))
 
-	tags := []tags.Tag{
-		{
-			Key:   compose.ProjectTag,
-			Value: project.Name,
-		},
-		{
-			Key:   compose.ServiceTag,
-			Value: service.Name,
-		},
-	}
-	tags = append(tags, toTags(service.Labels)...)
-
 	return &ecs.TaskDefinition{
 		ContainerDefinitions: []ecs.TaskDefinition_ContainerDefinition{
 			{
-				Command:           service.Command,
-				DisableNetworking: service.NetworkMode == "none",
-				DnsSearchDomains:  service.DNSSearch,
-				DnsServers:        service.DNS,
-				DockerLabels: map[string]string{
-					compose.ProjectTag: project.Name,
-					compose.ServiceTag: service.Name,
-				},
+				Command:               service.Command,
+				DisableNetworking:     service.NetworkMode == "none",
+				DnsSearchDomains:      service.DNSSearch,
+				DnsServers:            service.DNS,
 				DockerSecurityOptions: service.SecurityOpt,
 				EntryPoint:            service.Entrypoint,
 				Environment:           toKeyValuePair(service.Environment),
@@ -93,9 +77,8 @@ func Convert(project *types.Project, service types.ServiceConfig) (*ecs.TaskDefi
 				SystemControls:         toSystemControls(service.Sysctls),
 				Ulimits:                toUlimits(service.Ulimits),
 				User:                   service.User,
-
-				VolumesFrom:      nil,
-				WorkingDirectory: service.WorkingDir,
+				VolumesFrom:            nil,
+				WorkingDirectory:       service.WorkingDir,
 			},
 		},
 		Cpu:                     cpu,
@@ -107,7 +90,6 @@ func Convert(project *types.Project, service types.ServiceConfig) (*ecs.TaskDefi
 		PlacementConstraints:    toPlacementConstraints(service.Deploy),
 		ProxyConfiguration:      nil,
 		RequiresCompatibilities: []string{ecsapi.LaunchTypeFargate},
-		Tags:                    tags,
 	}, nil
 }
 
diff --git a/ecs/pkg/amazon/backend/testdata/simple/simple-cloudformation-conversion.golden b/ecs/pkg/amazon/backend/testdata/simple/simple-cloudformation-conversion.golden
index 2538d4c0..c941d5fe 100644
--- a/ecs/pkg/amazon/backend/testdata/simple/simple-cloudformation-conversion.golden
+++ b/ecs/pkg/amazon/backend/testdata/simple/simple-cloudformation-conversion.golden
@@ -116,6 +116,7 @@
             ]
           }
         },
+        "PropagateTags": "SERVICE",
         "SchedulingStrategy": "REPLICA",
         "ServiceRegistries": [
           {