diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 950ddb0..de076c8 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -28,44 +28,51 @@ jobs:
         run: |
           echo $GITHUB_SHA > ./maven.githash
       
-      - name: Make secrets directory
-        run : |
-          mkdir /home/runner/work/secrets
+      # - name: Make secrets directory
+      #   run : |
+      #     mkdir /home/runner/work/secrets
 
-      - name: Copy settings.xml
-        env:
-          MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }}
-        run : |
-          echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml
+      # - name: Copy settings.xml
+      #   env:
+      #     MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }}
+      #   run : |
+      #     echo $MAVEN_SETTINGS_XML > /home/runner/work/secrets/settings.xml
 
-      - name: Copy GPG passphrase
-        env:
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        run : |
-          echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file
+      # - name: Copy GPG passphrase
+      #   env:
+      #     GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      #   run : |
+      #     echo $GPG_PASSPHRASE > /home/runner/work/secrets/passphrase.file
 
-      - name: Copy GPG key
-        env:
-          GPG_KEY_BASE64: ${{ secrets.GPG_KEY }}
-        run : |
-          echo $GPG_KEY_BASE64 |  base64 --decode > /home/runner/work/secrets/galasa.gpg
+      # - name: Copy GPG key
+      #   env:
+      #     GPG_KEY_BASE64: ${{ secrets.GPG_KEY }}
+      #   run : |
+      #     echo $GPG_KEY_BASE64 |  base64 --decode > /home/runner/work/secrets/galasa.gpg
             
-        # Set up Maven GPG directory
-      - name: Make GPG home directory
-        run: |
-          mkdir /home/runner/work/gpg
+      #   # Set up Maven GPG directory
+      # - name: Make GPG home directory
+      #   run: |
+      #     mkdir /home/runner/work/gpg
         
-      - name: Change directory permissions
-        run: |
-          chmod '700' /home/runner/work/gpg
+      # - name: Change directory permissions
+      #   run: |
+      #     chmod '700' /home/runner/work/gpg
   
-      - name: Import GPG
-        run: |
-          gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg
+      # - name: Import GPG
+      #   run: |
+      #     gpg --homedir /home/runner/work/gpg --pinentry-mode loopback --passphrase-file /home/runner/work/secrets/passphrase.file --import /home/runner/work/secrets/galasa.gpg
         
-      - name: Copy custom settings.xml
-        run: |
-          cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml
+      # - name: Copy custom settings.xml
+      #   run: |
+      #     cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml
+
+      - name: Import GPG secrets and create custom settings.xml
+        uses: galasa-dev/automation/.github/actions/maven-gpg-setup@main
+        with:
+          MAVEN_SETTINGS_XML: ${{ secrets.MAVEN_SETTINGS_XML }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GPG_KEY_BASE64: ${{ secrets.GPG_KEY }}
       
       - name: Building Maven source code
         run: |