NRL-661 Use correct truststore make commands

Author: Tomdango

.github/workflows/persistent-environment.yml

@@ -95,7 +95,7 @@ jobs:
       - name: Retrieve Server Certificates
         run: |
           account=$(echo '${{ inputs.environment }}' | cut -d '-' -f1)
-          aws s3 cp s3://nhsd-nrlf--truststore/server/${account}.pem truststore/server/${account}.pem
+          make truststore-pull-server ENV=${account}
 
       - name: Download build artifacts
         uses: actions/download-artifact@v4
@@ -165,7 +165,6 @@ jobs:
         run: |
           account=$(echo '${{ inputs.environment }}' | cut -d '-' -f1)
           make truststore-pull-server ENV=${account}
-          aws s3 cp s3://nhsd-nrlf--truststore/server/${account}.pem truststore/server/${account}.pem
 
       - name: Terraform Init
         run: |

.github/workflows/pr-env-deploy.yml

@@ -133,7 +133,7 @@ jobs:
           role-session-name: github-actions-ci-${{ needs.set-environment-id.outputs.environment_id }}
 
       - name: Retrieve Server Certificates
-        run: aws s3 cp s3://nhsd-nrlf--truststore/server/dev.pem truststore/server/dev.pem
+        run: make truststore-pull-server ENV=dev
 
       - name: Terraform Init
         run: |