diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 756ab0991..06cfd9869 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -5,19 +5,11 @@ on:
     branches:
     - master
   pull_request:
-    paths:
-      - "**"
-      - "!**.md"
-      - "!.github/workflows/cron_build.yml"
-      - "!.github/workflows/cron.yml"
-      - "!.github/workflows/docker.yml"
-      - "!.github/workflows/repository_dispatch.yml"
-      - "!tools/config_editor/**"
-      - "!tools/docker/**"
-
-concurrency:
-  group: esp-idf-libs-${{github.event.pull_request.number || github.ref}}
-  cancel-in-progress: true
+    branches:
+    - master
+  
+  # Allows you to run this workflow manually from the Actions tab of the repository
+  workflow_dispatch:
 
 jobs:
   build-libs:
@@ -25,17 +17,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4]
+        target: [esp32s3]
       fail-fast: false
     steps:
     - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@v4
+      with:
+        repository: ${{ github.repository }}
+        token: ${{ github.token }}
 
     - name: Install dependencies
       run: bash ./tools/prepare-ci.sh
 
     - name: Build Libs for ${{ matrix.target }}
-      run: bash ./build.sh -e -t ${{ matrix.target }}
+      run: bash ./build.sh -e -t ${{ matrix.target }} -A release/v2.x -I release/v4.4
 
     - name: Upload build
       if: failure()
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 36fa6b6a5..0166f8bfe 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -9,6 +9,8 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
 CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
+# CUSTOM partition-table offset, moved from 0x8000 to 0xA000 to accomodatelarger 2.stage bootloader:
+CONFIG_PARTITION_TABLE_OFFSET=0xA000
 
 # ULP Setting for IDF 5.x
 CONFIG_ULP_COPROC_ENABLED=y
diff --git a/partitions.csv b/partitions.csv
index 97e41c452..f53d27e8b 100644
--- a/partitions.csv
+++ b/partitions.csv
@@ -1,8 +1,12 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,       0x9000,   0x5000,
-otadata,  data, ota,       0xe000,   0x2000,
-app0,     app,  ota_0,    0x10000, 0x300000,
-app1,     app,  ota_1,   0x310000, 0x300000,
-spiffs,   data, spiffs,  0x610000, 0x700000,
-model,    data, spiffs,  0xD10000, 0x2E0000,
-coredump, data, coredump,0xFF0000,  0x10000,
+# **********************************************************************************************
+# ***** 1MB factory, plus single 4MB app-partitions ('app0'), and 1MB data-partition. ****
+# **********************************************************************************************
+# Name,   Type, SubType,  Offset,   Size,  Flags
+nvs,      data, nvs,      0xB000,  0x2000
+otadata,  data, ota,      0xd000,  0x2000
+phy_init, data, phy,      0xf000,  0x1000
+app0,     app,  factory,  0x10000,  2M
+app1,     app,  ota_0,    ,         4M
+spiffs,   data, spiffs,   ,         1M
+nvs_key,  data, nvs_keys, ,        0x1000
+coredump, data, coredump, ,        64K