chore(Products Page): Resolve merge conflicts

.github/pull_request_template.md

@@ -0,0 +1,8 @@
+## Description
+_A brief description of the PR_
+
+## Code Changes
+_The following changes were made to the files below_
+
+## Notes
+_Any additional notes go here_

.github/workflows/continuous.yaml

@@ -1,19 +1,23 @@
 name: Continuous
 on:
   pull_request:
+  merge_group:
+  push:
+    branches:
+      - master
 
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   build-generic:
+    if: ${{ github.event_name == 'pull_request' || github.event_name == 'push' }}
     name: "Continuous Image Build"
     permissions:
       contents: 'read'
       id-token: 'write'
     runs-on: ubuntu-latest
-    if: github.event.pull_request.draft == false
     strategy:
       matrix:
         app: [ web, node ]
@@ -76,6 +80,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
   build-derived:
+    if: ${{ github.event_name == 'pull_request' || github.event_name == 'push' }}
     name: "Continuous Image Build Stage 2"
     runs-on: ubuntu-latest
     permissions:
@@ -86,7 +91,6 @@ jobs:
     strategy:
       matrix:
         app: [ asset, linker ]
-    if: github.event.pull_request.draft == false
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU

build/ci/sandbox-values.yaml

@@ -44,7 +44,7 @@ monitor:
     tag: 
 secrets:
   localSettings: 
-    ref: local-settings-secrets-dev
+    ref: local-settings-secrets
   backupManager: 
     ref: backup-manager
   slackWebhook: