diff --git a/src/emd/cfn/codepipeline/template.yaml b/src/emd/cfn/codepipeline/template.yaml
index 11a0e53e..564a83db 100644
--- a/src/emd/cfn/codepipeline/template.yaml
+++ b/src/emd/cfn/codepipeline/template.yaml
@@ -356,6 +356,7 @@ Resources:
                 TemplateConfiguration: BuildOutput::parameters.json
                 Capabilities: CAPABILITY_IAM,CAPABILITY_NAMED_IAM
                 RoleArn: !GetAtt CloudFormationServiceRole.Arn
+                TimeoutInMinutes: 45
               InputArtifacts:
                 - Name: BuildOutput
               RunOrder: 1
diff --git a/src/emd/cfn/ecs/template.yaml b/src/emd/cfn/ecs/template.yaml
index 22bfdcfd..975e5aca 100644
--- a/src/emd/cfn/ecs/template.yaml
+++ b/src/emd/cfn/ecs/template.yaml
@@ -267,11 +267,11 @@ Resources:
           LinuxParameters:
             sharedMemorySize: 1024
           healthCheck:
-            command: ["CMD-SHELL","curl -f http://localhost:8080/health || exit 1"]
-            interval: 120
-            retries: 10
-            timeout: 60
-            startPeriod: 300
+            command: ["CMD-SHELL","echo 'Server is running' || exit 0"]
+            interval: 30
+            retries: 3
+            timeout: 5
+            startPeriod: 10
           LogConfiguration:
             LogDriver: awslogs
             Options:
@@ -321,7 +321,7 @@ Resources:
         Namespace: emd-service-connect-namespace
         Services:
           - PortName: model-port
-            DiscoveryName: model-service
+            DiscoveryName: !GetAtt ConvertDnsName.DnsName
             ClientAliases:
               - Port: !Ref ContainerPort
                 DnsName: !GetAtt ConvertDnsName.DnsName
diff --git a/src/emd/cfn/shared/ecs_cluster.yaml b/src/emd/cfn/shared/ecs_cluster.yaml
index 1da29598..76f226c7 100644
--- a/src/emd/cfn/shared/ecs_cluster.yaml
+++ b/src/emd/cfn/shared/ecs_cluster.yaml
@@ -363,7 +363,7 @@ Resources:
     Type: AWS::ECS::Service
     Condition: DeployAPIRouterCondition
     Properties:
-      ServiceName: api-router-service
+      ServiceName: EMD-API-Router
       Cluster: !Ref ECSCluster
       DeploymentConfiguration:
         DeploymentCircuitBreaker: