diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index b7f77b96..a8bafef6 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -8,7 +8,7 @@ on:
       - 'dev'
       - 'demo'
 jobs:
-          
+
   deployDev:
       name: Deploy to Development Environment
       if: github.event.ref == 'refs/heads/dev'
@@ -18,7 +18,7 @@ jobs:
       secrets:
         ecr-role: ${{ secrets.DEV_ECR_ROLE_TO_ASSUME }}
         ecr-region: ${{ vars.DEV_ECR_REGION }}
-        ecr-repo: ${{ vars.DEV_ECR_REPOSITORY }} 
+        ecr-repo: ${{ vars.DEV_ECR_REPOSITORY }}
         cp-user: ${{ secrets.PACKAGIST_USER }}
         cp-password: ${{ secrets.PACKAGIST_PASSWORD }}
         acf-user: ${{ secrets.ACF_USER }}
@@ -43,8 +43,8 @@ jobs:
         wp-secure-auth-key-file: ${{ secrets.WORDPRESS_SECURE_AUTH_KEY_FILE }}
         wp-secure-auth-salt-file: ${{ secrets.WORDPRESS_SECURE_AUTH_SALT_FILE }}
         s3-uploads-bucket: ${{ secrets.S3_UPLOADS_BUCKET }}
-        s3-uploads-region: ${{ secrets.S3_UPLOADS_REGION }}   
-        alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}       
+        s3-uploads-region: ${{ secrets.S3_UPLOADS_REGION }}
+        alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}
 
   deployDemo:
       name: Deploy to Demo Environment
@@ -55,9 +55,9 @@ jobs:
       secrets:
         ecr-role: ${{ secrets.DEMO_ECR_ROLE_TO_ASSUME }}
         ecr-region: ${{ vars.DEMO_ECR_REGION }}
-        ecr-repo: ${{ vars.DEMO_ECR_REPOSITORY }} 
-        cp-user: ${{ secrets.COMPOSER_USER }}
-        cp-password: ${{ secrets.COMPOSER_PASS }}
+        ecr-repo: ${{ vars.DEMO_ECR_REPOSITORY }}
+        cp-user: ${{ secrets.PACKAGIST_USER }}
+        cp-password: ${{ secrets.PACKAGIST_PASSWORD }}
         acf-user: ${{ secrets.ACF_USER }}
         acf-password: ${{ secrets.ACF_PASSWORD }}
         kube-cluster: ${{ secrets.KUBE_CLUSTER }}
@@ -80,8 +80,8 @@ jobs:
         wp-secure-auth-key-file: ${{ secrets.WORDPRESS_SECURE_AUTH_KEY_FILE }}
         wp-secure-auth-salt-file: ${{ secrets.WORDPRESS_SECURE_AUTH_SALT_FILE }}
         s3-uploads-bucket: ${{ secrets.S3_UPLOADS_BUCKET }}
-        s3-uploads-region: ${{ secrets.S3_UPLOADS_REGION }}   
-        alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}   
+        s3-uploads-region: ${{ secrets.S3_UPLOADS_REGION }}
+        alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}
 
   deployStaging:
       name: Deploy to Staging Environment
@@ -92,9 +92,9 @@ jobs:
       secrets:
         ecr-role: ${{ secrets.STAGING_ECR_ROLE_TO_ASSUME }}
         ecr-region: ${{ vars.STAGING_ECR_REGION }}
-        ecr-repo: ${{ vars.STAGING_ECR_REPOSITORY }} 
-        cp-user: ${{ secrets.COMPOSER_USER }}
-        cp-password: ${{ secrets.COMPOSER_PASS }}
+        ecr-repo: ${{ vars.STAGING_ECR_REPOSITORY }}
+        cp-user: ${{ secrets.PACKAGIST_USER }}
+        cp-password: ${{ secrets.PACKAGIST_PASSWORD }}
         acf-user: ${{ secrets.ACF_USER }}
         acf-password: ${{ secrets.ACF_PASSWORD }}
         kube-cluster: ${{ secrets.KUBE_CLUSTER }}
@@ -117,8 +117,8 @@ jobs:
         wp-secure-auth-key-file: ${{ secrets.WORDPRESS_SECURE_AUTH_KEY_FILE }}
         wp-secure-auth-salt-file: ${{ secrets.WORDPRESS_SECURE_AUTH_SALT_FILE }}
         s3-uploads-bucket: ${{ secrets.S3_UPLOADS_BUCKET }}
-        s3-uploads-region: ${{ secrets.S3_UPLOADS_REGION }}   
-        alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }} 
+        s3-uploads-region: ${{ secrets.S3_UPLOADS_REGION }}
+        alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}
 
   deployProd:
       name: Deploy to Production Environment
@@ -130,9 +130,9 @@ jobs:
       secrets:
         ecr-role: ${{ secrets.PROD_ECR_ROLE_TO_ASSUME }}
         ecr-region: ${{ vars.PROD_ECR_REGION }}
-        ecr-repo: ${{ vars.PROD_ECR_REPOSITORY }} 
-        cp-user: ${{ secrets.COMPOSER_USER }}
-        cp-password: ${{ secrets.COMPOSER_PASS }}
+        ecr-repo: ${{ vars.PROD_ECR_REPOSITORY }}
+        cp-user: ${{ secrets.PACKAGIST_USER }}
+        cp-password: ${{ secrets.PACKAGIST_PASSWORD }}
         acf-user: ${{ secrets.ACF_USER }}
         acf-password: ${{ secrets.ACF_PASSWORD }}
         kube-cluster: ${{ secrets.KUBE_CLUSTER }}
@@ -155,5 +155,5 @@ jobs:
         wp-secure-auth-key-file: ${{ secrets.WORDPRESS_SECURE_AUTH_KEY_FILE }}
         wp-secure-auth-salt-file: ${{ secrets.WORDPRESS_SECURE_AUTH_SALT_FILE }}
         s3-uploads-bucket: ${{ secrets.S3_UPLOADS_BUCKET }}
-        s3-uploads-region: ${{ secrets.S3_UPLOADS_REGION }}   
-        alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }} 
+        s3-uploads-region: ${{ secrets.S3_UPLOADS_REGION }}
+        alert-slack-webhook-url: ${{ secrets.ALERT_SLACK_WEBHOOK_URL }}