diff --git a/.github/workflows/build-full-environment.yml b/.github/workflows/build-full-environment.yml
index 7bb244818..1f3c29aff 100644
--- a/.github/workflows/build-full-environment.yml
+++ b/.github/workflows/build-full-environment.yml
@@ -7,6 +7,16 @@ permissions:
   packages: write
 
 on:
+  pull_request_target:
+    types:
+      - closed
+    branches:
+      - 'main'
+    paths:
+      - ".github/workflows/**"
+      - "client/**"
+      - "server/**"
+      - "!**/README.md"
   workflow_dispatch:
     inputs:
       TAG:
diff --git a/.github/workflows/mvn-build.yml b/.github/workflows/mvn-build.yml
index c1824f678..7104a4173 100644
--- a/.github/workflows/mvn-build.yml
+++ b/.github/workflows/mvn-build.yml
@@ -72,7 +72,7 @@ jobs:
       
       - uses: actions/upload-artifact@v3
         with:
-          name: Package-client
+          name: ${{ inputs.PROJECT_NAME }}-package
           path: staging
 
       - name: Cache local Maven repository
diff --git a/client/wfprev-war/Dockerfile b/client/wfprev-war/Dockerfile
index 58bd6cbfe..0b6d10d19 100644
--- a/client/wfprev-war/Dockerfile
+++ b/client/wfprev-war/Dockerfile
@@ -4,10 +4,10 @@ FROM node:18 AS build
 WORKDIR /src/main/angular
 
 # Add NPM Token from build arguments for private registry authentication
-ARG NPM_TOKEN
-ARG PRIVATE_REGISTRY_AUTH
-RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
-RUN echo "//bwa.nrs.gov.bc.ca/int/artifactory/api/npm/nrs-virtual-npm/:_auth=${PRIVATE_REGISTRY_AUTH}" >> .npmrc
+# ARG NPM_TOKEN
+# ARG PRIVATE_REGISTRY_AUTH
+# RUN echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
+# RUN echo "//bwa.nrs.gov.bc.ca/int/artifactory/api/npm/nrs-virtual-npm/:_auth=${PRIVATE_REGISTRY_AUTH}" >> .npmrc
 
 # Copy the package.json and package-lock.json files
 COPY src/main/angular/package*.json ./