diff --git a/deployments/pipeline-new.yml b/deployments/pipeline-new.yml
index 4f96942..2e1fbf3 100644
--- a/deployments/pipeline-new.yml
+++ b/deployments/pipeline-new.yml
@@ -173,72 +173,74 @@ Resources:
         #       InputArtifacts:
         #         - Name: Source
 
-        # #-----------------------------------------------------------------------------#
-        # # Services
-        # #-----------------------------------------------------------------------------#
-        # - Name: Services
-        #   Actions:
+        #-----------------------------------------------------------------------------#
+        # Services
+        #-----------------------------------------------------------------------------#
+        - Name: Services
+          Actions:
 
-        #     - Name: Server
-        #       ActionTypeId:
-        #         Category: Deploy
-        #         Owner: AWS
-        #         Version: 1
-        #         Provider: CloudFormation
-        #       Configuration:
-        #         ActionMode: CREATE_UPDATE
-        #         RoleArn: !GetAtt CloudFormationDeployRole.Arn
-        #         StackName: !Sub ${EnvironmentName}-Server
-        #         TemplatePath: !Sub Source::deployments/services-${DeploymentType}/server.yml
-        #         Capabilities: CAPABILITY_IAM
-        #         ParameterOverrides: !Sub |
-        #           {
-        #             "EnvironmentName": "${EnvironmentName}",
-        #             "ServiceName": "server",
-        #             "ImageUrl": "don't have it yet"
-        #           }
-        #       InputArtifacts:
-        #         - Name: Source
+            - Name: Server
+              ActionTypeId:
+                Category: Deploy
+                Owner: AWS
+                Version: 1
+                Provider: CloudFormation
+              Configuration:
+                ActionMode: CREATE_UPDATE
+                RoleArn: !GetAtt CloudFormationDeployRole.Arn
+                StackName: !Sub ${EnvironmentName}-Server
+                TemplatePath: !Sub Source::deployments/services-${DeploymentType}/server.yml
+                Capabilities: CAPABILITY_IAM
+                ParameterOverrides: !Sub |
+                  {
+                    "EnvironmentName": "${EnvironmentName}",
+                    "ServiceName": "server",
+                    "ImageUrl": "amazon/amazon-ecs-sample"
+                  }
+              InputArtifacts:
+                - Name: Source
 
-        #     - Name: Cache
-        #       ActionTypeId:
-        #         Category: Deploy
-        #         Owner: AWS
-        #         Version: 1
-        #         Provider: CloudFormation
-        #       Configuration:
-        #         ActionMode: CREATE_UPDATE
-        #         RoleArn: !GetAtt CloudFormationDeployRole.Arn
-        #         StackName: !Sub ${EnvironmentName}-Cache
-        #         TemplatePath: !Sub Source::deployments/services-${DeploymentType}/cache.yml
-        #         Capabilities: CAPABILITY_IAM
-        #         ParameterOverrides: !Sub |
-        #           {
-        #             "EnvironmentName": "${EnvironmentName}",
-        #             "ServiceName": "cache"
-        #           }
-        #       InputArtifacts:
-        #         - Name: Source
+            - Name: Cache
+              ActionTypeId:
+                Category: Deploy
+                Owner: AWS
+                Version: 1
+                Provider: CloudFormation
+              Configuration:
+                ActionMode: CREATE_UPDATE
+                RoleArn: !GetAtt CloudFormationDeployRole.Arn
+                StackName: !Sub ${EnvironmentName}-Cache
+                TemplatePath: !Sub Source::deployments/services-${DeploymentType}/cache.yml
+                Capabilities: CAPABILITY_IAM
+                ParameterOverrides: !Sub |
+                  {
+                    "EnvironmentName": "${EnvironmentName}",
+                    "ServiceName": "cache",
+                    "ImageUrl": "amazon/amazon-ecs-sample"
+                  }
+              InputArtifacts:
+                - Name: Source
 
-        #     - Name: Database
-        #       ActionTypeId:
-        #         Category: Deploy
-        #         Owner: AWS
-        #         Version: 1
-        #         Provider: CloudFormation
-        #       Configuration:
-        #         ActionMode: CREATE_UPDATE
-        #         RoleArn: !GetAtt CloudFormationDeployRole.Arn
-        #         StackName: !Sub ${EnvironmentName}-Database
-        #         TemplatePath: !Sub Source::deployments/services-${DeploymentType}/database.yml
-        #         Capabilities: CAPABILITY_IAM
-        #         ParameterOverrides: !Sub |
-        #           {
-        #             "EnvironmentName": "${EnvironmentName}",
-        #             "ServiceName": "database"
-        #           }
-        #       InputArtifacts:
-        #         - Name: Source
+            - Name: Database
+              ActionTypeId:
+                Category: Deploy
+                Owner: AWS
+                Version: 1
+                Provider: CloudFormation
+              Configuration:
+                ActionMode: CREATE_UPDATE
+                RoleArn: !GetAtt CloudFormationDeployRole.Arn
+                StackName: !Sub ${EnvironmentName}-Database
+                TemplatePath: !Sub Source::deployments/services-${DeploymentType}/database.yml
+                Capabilities: CAPABILITY_IAM
+                ParameterOverrides: !Sub |
+                  {
+                    "EnvironmentName": "${EnvironmentName}",
+                    "ServiceName": "database",
+                    "ImageUrl": "amazon/amazon-ecs-sample"
+                  }
+              InputArtifacts:
+                - Name: Source
 
 
         #-----------------------------------------------------------------------------#
diff --git a/deployments/pipeline-service.yml b/deployments/pipeline-service.yml
index d6fcfa7..009100f 100644
--- a/deployments/pipeline-service.yml
+++ b/deployments/pipeline-service.yml
@@ -29,9 +29,9 @@ Parameters:
   CodePipelineServiceRoleArn:
     Type: AWS::SSM::Parameter::Value<String>
     Default: /microservices/codepipeline_service_role_arn
-  CloudFormationDeployRole:
-    Type: AWS::SSM::Parameter::Value<String>
-    Default: /microservices/cloudformation_deploy_role
+  # CloudFormationDeployRole:
+  #   Type: AWS::SSM::Parameter::Value<String>
+  #   Default: /microservices/cloudformation_deploy_role
 
 Resources:
 
@@ -181,22 +181,6 @@ Resources:
         #-----------------------------------------------------------------------------#
         # Deploy
         #-----------------------------------------------------------------------------#
-        # - Name: Deploy
-        #   Actions:
-        #     - Name: Deploy
-        #       ActionTypeId:
-        #         Category: Deploy
-        #         Owner: AWS
-        #         Version: 1
-        #         Provider: ECS
-        #       Configuration:
-        #         ClusterName:
-        #           Fn::ImportValue: !Sub ${EnvironmentName}:ClusterName
-        #         ServiceName: !Ref ServiceName
-        #         FileName: imageDetail.json
-        #       InputArtifacts:
-        #         - Name: Image
-
         - Name: Deploy
           Actions:
             - Name: Deploy
@@ -204,21 +188,37 @@ Resources:
                 Category: Deploy
                 Owner: AWS
                 Version: 1
-                Provider: CloudFormation
+                Provider: ECS
               Configuration:
-                ActionMode: CREATE_UPDATE
-                RoleArn: !Ref CloudFormationDeployRole
-                StackName: !Sub ${EnvironmentName}-ServerService
-                TemplatePath: !Sub Code::deployments/services-${DeploymentType}/server.yml
-                Capabilities: CAPABILITY_IAM
-                ParameterOverrides: !Sub |
-                  {
-                    "EnvironmentName": "${EnvironmentName}",
-                    "ImageUrl": "${Repository.RepositoryUri}@#{ImageVariables.ImageDigest}"
-                  }
+                ClusterName:
+                  Fn::ImportValue: !Sub ${EnvironmentName}:ClusterName
+                ServiceName: !Ref ServiceName
+                FileName: imageDetail.json
               InputArtifacts:
                 - Name: Image
-                - Name: Code
+
+        # - Name: Deploy
+        #   Actions:
+        #     - Name: Deploy
+        #       ActionTypeId:
+        #         Category: Deploy
+        #         Owner: AWS
+        #         Version: 1
+        #         Provider: CloudFormation
+        #       Configuration:
+        #         ActionMode: CREATE_UPDATE
+        #         RoleArn: !Ref CloudFormationDeployRole
+        #         StackName: !Sub ${EnvironmentName}-ServerService
+        #         TemplatePath: !Sub Code::deployments/services-${DeploymentType}/server.yml
+        #         Capabilities: CAPABILITY_IAM
+        #         ParameterOverrides: !Sub |
+        #           {
+        #             "EnvironmentName": "${EnvironmentName}",
+        #             "ImageUrl": "${Repository.RepositoryUri}@#{ImageVariables.ImageDigest}"
+        #           }
+        #       InputArtifacts:
+        #         - Name: Image
+        #         - Name: Code
 
   #-----------------------------------------------------------------------------#
   # Role for CodeBuild service