diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 7929da12e7..6e04ca6f67 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -12,6 +12,13 @@ on:
       - master
   pull_request:
   workflow_dispatch:
+  workflow_call:
+    inputs:
+      run_as_oss:
+        type: boolean
+        required: false
+        description: Force running checks as if it was an OSS contributor
+        default: false
 
 env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
@@ -19,7 +26,7 @@ env:
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   NX_BASE_BRANCH: origin/${{ github.base_ref }}
   USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' }}
-  IS_OSS_CONTRIBUTOR: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase' }}
+  IS_OSS_CONTRIBUTOR: ${{ inputs.run_as_oss == true || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase') }}
 
 jobs:
   lint:
diff --git a/.github/workflows/check-oss-contributor.yml b/.github/workflows/check-oss-contributor.yml
new file mode 100644
index 0000000000..398f07a130
--- /dev/null
+++ b/.github/workflows/check-oss-contributor.yml
@@ -0,0 +1,35 @@
+name: OSS contributor checks
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 8,16 * * 1-5" # on weekdays at 8am and 4pm
+
+jobs:
+  run-checks:
+    name: Publish server and worker docker images
+    uses: ./.github/workflows/budibase_ci.yml
+    with:
+      run_as_oss: true
+    secrets: inherit
+
+  notify-error:
+    needs: ["run-checks"]
+    if: ${{ failure() }}
+    name: Notify error
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set commit SHA
+        id: set_sha
+        run: echo "::set-output name=sha::$(git rev-parse --short ${{ github.sha }})"
+
+      - name: Notify error
+        uses: tsickert/discord-webhook@v5.3.0
+        with:
+          webhook-url: ${{ secrets.OSS_CHECKS_WEBHOOK_URL }}
+          embed-title: 🚨 OSS checks failed in master
+          embed-url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          embed-description: |
+            Git sha: `${{ steps.set_sha.outputs.sha }}`
diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
index f1fb12c087..c70f2fff20 100644
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   release:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
diff --git a/packages/builder/src/components/design/settings/controls/SectionSelect.svelte b/packages/builder/src/components/design/settings/controls/SectionSelect.svelte
index 4394f47cef..5b4eb8d2a9 100644
--- a/packages/builder/src/components/design/settings/controls/SectionSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SectionSelect.svelte
@@ -32,7 +32,9 @@
   }
 </script>
 
-<ActionButton on:click={modal.show}>{layoutMap[value].name}</ActionButton>
+<ActionButton on:click={modal.show}>
+  {layoutMap[value || "mainSidebar"].name}
+</ActionButton>
 <Modal bind:this={modal}>
   <ModalContent
     onConfirm={() => dispatch("change", selected)}