diff --git a/.github/workflows/pr-env-destroy.yml b/.github/workflows/pr-env-destroy.yml
index 42e5bab46..83a005079 100644
--- a/.github/workflows/pr-env-destroy.yml
+++ b/.github/workflows/pr-env-destroy.yml
@@ -4,6 +4,7 @@ run-name: "Destroy PR Environment - #${{ github.event.pull_request.number }} (${
 on:
   pull_request:
     types: [closed]
+  workflow_dispatch:
 
 concurrency:
   group: environment-${{ github.event.pull_request.number }}
@@ -73,9 +74,13 @@ jobs:
       - name: Terraform Init
         run: |
           terraform -chdir=terraform/infrastructure init
-          terraform -chdir=terraform/infrastructure workspace new ${{ needs.set-environment-id.outputs.environment_id }} || \
           terraform -chdir=terraform/infrastructure workspace select ${{ needs.set-environment-id.outputs.environment_id }}
 
+      - name: Build artifacts
+        run: |
+          make build
+          make get-s3-permissions
+
       - name: Terraform Destroy
         run: |
           terraform -chdir=terraform/infrastructure destroy \