diff --git a/deployments/pipeline-new.yml b/deployments/pipeline-new.yml
index 2aae4de..5d3175e 100644
--- a/deployments/pipeline-new.yml
+++ b/deployments/pipeline-new.yml
@@ -60,7 +60,6 @@ Resources:
     DependsOn:
       - SSMArtifactBucket
       - SSMCodePipelineServiceRoleArn
-      # - SSMCloudFormationDeployRole
     Properties:
       RoleArn: !GetAtt CodePipelineServiceRole.Arn
       ArtifactStore:
@@ -269,11 +268,9 @@ Resources:
             #       {
             #         "EnvironmentName": "${EnvironmentName}",
             #         "ServiceName": "server",
-            #         "DeploymentType": "${DeploymentType}",
-            #         "TriggerMessagePattern": "[(BuildServer|BuildAll)]",
+            #         "TriggerPattern": "\\[(BuildServer|BuildAll)\\]",
             #         "GitHubRepo": "${GitHubRepo}",
             #         "GitHubBranch": "${GitHubBranch}",
-            #         "GitHubToken": "${GitHubToken}",
             #         "GitHubUser": "${GitHubUser}"
             #       }
             #   InputArtifacts:
@@ -295,11 +292,9 @@ Resources:
             #       {
             #         "EnvironmentName": "${EnvironmentName}",
             #         "ServiceName": "cache",
-            #         "DeploymentType": "${DeploymentType}",
-            #         "TriggerMessagePattern": "[(BuildCache|BuildAll)]",
+            #         "TriggerPattern": "\\[(BuildCache|BuildAll)\\]",
             #         "GitHubRepo": "${GitHubRepo}",
             #         "GitHubBranch": "${GitHubBranch}",
-            #         "GitHubToken": "${GitHubToken}",
             #         "GitHubUser": "${GitHubUser}"
             #       }
             #   InputArtifacts:
@@ -321,18 +316,16 @@ Resources:
                   {
                     "EnvironmentName": "${EnvironmentName}",
                     "ServiceName": "database",
-                    "DeploymentType": "${DeploymentType}",
-                    "TriggerMessagePattern": "\\[(BuildDatabase|BuildAll)\\]",
+                    "TriggerPattern": "\\[(BuildDatabase|BuildAll)\\]",
                     "GitHubRepo": "${GitHubRepo}",
                     "GitHubBranch": "${GitHubBranch}",
-                    "GitHubToken": "${GitHubToken}",
                     "GitHubUser": "${GitHubUser}"
                   }
               InputArtifacts:
                 - Name: Source
 
   #-----------------------------------------------------------------------------#
-  # Role for CodePipeline service
+  # Roles for CodePipeline service
   #-----------------------------------------------------------------------------#
   CodePipelineServiceRole:
     Type: AWS::IAM::Role
@@ -352,8 +345,8 @@ Resources:
             Statement:
               # Allow codepipeline to put artifacts in the S3 bucket
               # as well as get artifacts back out of it.
-              - Resource: "*"
-                  # - !Sub arn:aws:s3:::${ArtifactBucket}*
+              - Resource:
+                  - !Sub arn:aws:s3:::${ArtifactBucket}*
                 Effect: Allow
                 Action:
                   - s3:PutObject
@@ -445,7 +438,7 @@ Resources:
                   - "codepipeline:*"
                   - "events:*"
                   - "ecs:*"
-                  - "s3:*"
+                  # - "s3:*"
                 Resource: "*"
 
   #-----------------------------------------------------------------------------#
@@ -463,12 +456,6 @@ Resources:
       Name: /microservices/codepipeline_service_role_arn
       Type: String
       Value: !GetAtt CodePipelineServiceRole.Arn
-  # SSMCloudFormationDeployRole:
-  #   Type: AWS::SSM::Parameter
-  #   Properties:
-  #     Name: /microservices/cloudformation_deploy_role
-  #     Type: String
-  #     Value: !Ref CloudFormationDeployRole
 
 Outputs:
   PipelineUrl:
diff --git a/deployments/pipeline-service.yml b/deployments/pipeline-service.yml
index 8a46f3e..e927d06 100644
--- a/deployments/pipeline-service.yml
+++ b/deployments/pipeline-service.yml
@@ -3,23 +3,23 @@ Parameters:
     Type: String
   GitHubBranch:
     Type: String
-  GitHubToken:
-    Type: String
-    NoEcho: true
+  # GitHubToken:
+  #   Type: String
+  #   NoEcho: true
   GitHubUser:
     Type: String
   EnvironmentName:
     Type: String
     Default: production
-  DeploymentType:
-    Type: String
-    Default: fargate
-    AllowedValues: [ecs, fargate]
+  # DeploymentType:
+  #   Type: String
+  #   Default: fargate
+  #   AllowedValues: [ecs, fargate]
   ServiceName:
     Type: String
     Description: The name of the service
     AllowedValues: [server, cache, database]
-  TriggerMessagePattern:
+  TriggerPattern:
     Type: String
     Description: A commit message that triggers the build process
     Default: \[BuildAll\]
@@ -29,9 +29,6 @@ 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
 
 Resources:
 
@@ -46,18 +43,10 @@ Resources:
   #-----------------------------------------------------------------------------#
   # CodeBuild Project
   #-----------------------------------------------------------------------------#
-  # SourceCredentials:
-  #   Type: AWS::CodeBuild::SourceCredential
-  #   Properties:
-  #     Token: !Ref GitHubToken
-  #     ServerType: GITHUB
-  #     AuthType: PERSONAL_ACCESS_TOKEN
-
-
   CodeBuildProject:
     Type: AWS::CodeBuild::Project
-    # DependsOn: SourceCredentials
     Properties:
+      Name: !Sub ${EnvironmentName}-${ServiceName}
       Artifacts:
         Type: S3
         Location: !Ref ArtifactBucket
@@ -94,7 +83,7 @@ Resources:
             Pattern: !Sub ^refs/heads/${GitHubBranch}$
             ExcludeMatchedPattern: false
           - Type: COMMIT_MESSAGE
-            Pattern: !Ref TriggerMessagePattern
+            Pattern: !Ref TriggerPattern
             ExcludeMatchedPattern: false
         # - - Type: EVENT
         #     Pattern: PUSH
@@ -125,20 +114,6 @@ Resources:
           RoleArn: !GetAtt CloudWatchEventRole.Arn
           Id: server-pipeline
 
-  # PipelineWebhook: 
-  #   Type: AWS::CodePipeline::Webhook
-  #   Properties:
-  #     AuthenticationConfiguration:
-  #       SecretToken: !Ref GitHubToken
-  #     Filters:
-  #       - JsonPath: "$.ref"
-  #         MatchEquals: refs/heads/{Branch}
-  #     Authentication: GITHUB_HMAC
-  #     TargetPipeline: !Ref Pipeline
-  #     TargetAction: Code
-  #     TargetPipelineVersion: !GetAtt Pipeline.Version
-  #     RegisterWithThirdParty: false # only manual action
-
   Pipeline:
     Type: AWS::CodePipeline::Pipeline
     Properties:
@@ -153,21 +128,6 @@ Resources:
         #-----------------------------------------------------------------------------#
         - Name: Source
           Actions:
-
-            # - Name: Image
-            #   Namespace: ImageVariables
-            #   ActionTypeId:
-            #     Category: Source
-            #     Owner: AWS
-            #     Version: 1
-            #     Provider: ECR
-            #   Configuration:
-            #     RepositoryName: !Ref Repository
-            #     ImageTag: latest
-            #   OutputArtifacts:
-            #     - Name: Image
-            #   RunOrder: 1
-
             - Name: Image
               ActionTypeId:
                 Category: Source
@@ -182,21 +142,6 @@ Resources:
                 - Name: Image
               RunOrder: 1
 
-            # - Name: Code
-            #   ActionTypeId:
-            #     Category: Source
-            #     Owner: ThirdParty
-            #     Version: 1
-            #     Provider: GitHub
-            #   Configuration:
-            #     Owner: !Ref GitHubUser
-            #     Repo: !Ref GitHubRepo
-            #     Branch: !Ref GitHubBranch
-            #     OAuthToken: !Ref GitHubToken
-            #     PollForSourceChanges: false
-            #   OutputArtifacts:
-            #     - Name: Code
-
         #-----------------------------------------------------------------------------#
         # Deploy
         #-----------------------------------------------------------------------------#
@@ -216,30 +161,6 @@ Resources:
               InputArtifacts:
                 - Name: Image
 
-        # - Name: Deploy
-        #   Actions:
-        #     - Name: Deploy
-        #       ActionTypeId:
-        #         Category: Deploy
-        #         Owner: AWS
-        #         Version: 1
-        #         Provider: CloudFormation
-        #       Configuration:
-        #         ActionMode: CREATE_UPDATE
-        #         RoleArn: !Ref CloudFormationDeployRole
-        #         StackName: !Sub ${EnvironmentName}-Server-Service
-        #         TemplatePath: !Sub Code::deployments/services-${DeploymentType}/server.yml
-        #         Capabilities: CAPABILITY_IAM
-        #         ParameterOverrides: !Sub |
-        #           {
-        #             "EnvironmentName": "${EnvironmentName}",
-        #             "ServiceName": "${ServiceName}",
-        #             "ImageUrl": "${Repository.RepositoryUri}@#{ImageVariables.ImageDigest}"
-        #           }
-        #       InputArtifacts:
-        #         - Name: Image
-        #         - Name: Code
-
   #-----------------------------------------------------------------------------#
   # Role for CodeBuild service
   #-----------------------------------------------------------------------------#