diff --git a/.github/workflows/app-build-image.yml b/.github/workflows/app-build-image.yml
index 710d31c9..74a01048 100644
--- a/.github/workflows/app-build-image.yml
+++ b/.github/workflows/app-build-image.yml
@@ -47,7 +47,7 @@ on:
       builder_repository:
         required: false
         type: string
-        default: Rocket-Quack/frappe_docker
+        default: frappe/frappe_docker
         description: "Repository that contains the Containerfile and helper scripts"
       builder_ref:
         required: false
diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
new file mode 100644
index 00000000..dfb0ee69
--- /dev/null
+++ b/.github/workflows/build_develop.yml
@@ -0,0 +1,12 @@
+name: Legacy / Build Develop
+
+on:
+  workflow_dispatch:
+
+jobs:
+  delegate:
+    uses: ./.github/workflows/core-build-develop.yml
+    permissions:
+      contents: read
+      packages: write
+    secrets: inherit
diff --git a/.github/workflows/build_stable.yml b/.github/workflows/build_stable.yml
new file mode 100644
index 00000000..15438f00
--- /dev/null
+++ b/.github/workflows/build_stable.yml
@@ -0,0 +1,12 @@
+name: Legacy / Build Stable
+
+on:
+  workflow_dispatch:
+
+jobs:
+  delegate:
+    uses: ./.github/workflows/core-build-stable.yml
+    permissions:
+      contents: read
+      packages: write
+    secrets: inherit
diff --git a/.github/workflows/core-build-develop.yml b/.github/workflows/core-build-develop.yml
index 8085b553..64800241 100644
--- a/.github/workflows/core-build-develop.yml
+++ b/.github/workflows/core-build-develop.yml
@@ -35,7 +35,7 @@ jobs:
       node_version: 24.12.0
 
   publish:
-    if: ${{ contains(fromJSON('["frappe/frappe_docker","Rocket-Quack/frappe_docker"]'), github.repository) && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
     needs: test
     uses: ./.github/workflows/core-publish-images.yml
     with:
diff --git a/.github/workflows/core-build-stable.yml b/.github/workflows/core-build-stable.yml
index 5e11a015..6c453adb 100644
--- a/.github/workflows/core-build-stable.yml
+++ b/.github/workflows/core-build-stable.yml
@@ -48,7 +48,7 @@ jobs:
       node_version: 20.19.2
 
   v15_publish:
-    if: ${{ contains(fromJSON('["frappe/frappe_docker","Rocket-Quack/frappe_docker"]'), github.repository) && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
     needs: v15_test
     uses: ./.github/workflows/core-publish-images.yml
     with:
@@ -69,7 +69,7 @@ jobs:
       python_version: 3.14.2
       node_version: 24.12.0
   v16_publish:
-    if: ${{ contains(fromJSON('["frappe/frappe_docker","Rocket-Quack/frappe_docker"]'), github.repository) && github.event_name != 'pull_request' }}
+    if: ${{ github.repository == 'frappe/frappe_docker' && github.event_name != 'pull_request' }}
     needs: v16_test
     uses: ./.github/workflows/core-publish-images.yml
     with:
diff --git a/example.env b/example.env
index 5471b7dc..7f48e72e 100644
--- a/example.env
+++ b/example.env
@@ -1,6 +1,6 @@
 # Reference: https://github.com/frappe/frappe_docker/blob/main/docs/02-setup/04-env-variables.md
 
-ERPNEXT_VERSION=v16.14.0
+ERPNEXT_VERSION=v16.15.0
 
 DB_PASSWORD=123
 
diff --git a/images/custom/Containerfile b/images/custom/Containerfile
index e0c5b335..febc72b9 100644
--- a/images/custom/Containerfile
+++ b/images/custom/Containerfile
@@ -49,6 +49,7 @@ RUN useradd -ms /bin/bash frappe \
     && nvm install ${NODE_VERSION} \
     && nvm use v${NODE_VERSION} \
     && npm install -g yarn \
+    && corepack enable pnpm \
     && nvm alias default v${NODE_VERSION} \
     && rm -rf ${NVM_DIR}/.cache \
     && echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \
diff --git a/images/production/Containerfile b/images/production/Containerfile
index 4dfb8685..48df0d9d 100644
--- a/images/production/Containerfile
+++ b/images/production/Containerfile
@@ -45,6 +45,7 @@ RUN useradd -ms /bin/bash frappe \
     && nvm install ${NODE_VERSION} \
     && nvm use v${NODE_VERSION} \
     && npm install -g yarn \
+    && corepack enable pnpm \
     && nvm alias default v${NODE_VERSION} \
     && rm -rf ${NVM_DIR}/.cache \
     && echo 'export NVM_DIR="/home/frappe/.nvm"' >>/home/frappe/.bashrc \
diff --git a/pwd.yml b/pwd.yml
index 4cb9b474..9895ca19 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -1,6 +1,6 @@
 services:
   backend:
-    image: frappe/erpnext:v16.14.0
+    image: frappe/erpnext:v16.15.0
     networks:
       - frappe_network
     deploy:
@@ -16,7 +16,7 @@ services:
       MARIADB_ROOT_PASSWORD: admin
 
   configurator:
-    image: frappe/erpnext:v16.14.0
+    image: frappe/erpnext:v16.15.0
     networks:
       - frappe_network
     deploy:
@@ -45,7 +45,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   create-site:
-    image: frappe/erpnext:v16.14.0
+    image: frappe/erpnext:v16.15.0
     networks:
       - frappe_network
     deploy:
@@ -99,7 +99,7 @@ services:
       - db-data:/var/lib/mysql
 
   frontend:
-    image: frappe/erpnext:v16.14.0
+    image: frappe/erpnext:v16.15.0
     networks:
       - frappe_network
     depends_on:
@@ -125,7 +125,7 @@ services:
       - "8080:8080"
 
   queue-long:
-    image: frappe/erpnext:v16.14.0
+    image: frappe/erpnext:v16.15.0
     networks:
       - frappe_network
     deploy:
@@ -144,7 +144,7 @@ services:
       FRAPPE_REDIS_QUEUE: redis://redis-queue:6379
 
   queue-short:
-    image: frappe/erpnext:v16.14.0
+    image: frappe/erpnext:v16.15.0
     networks:
       - frappe_network
     deploy:
@@ -181,7 +181,7 @@ services:
         condition: on-failure
 
   scheduler:
-    image: frappe/erpnext:v16.14.0
+    image: frappe/erpnext:v16.15.0
     networks:
       - frappe_network
     deploy:
@@ -195,7 +195,7 @@ services:
       - logs:/home/frappe/frappe-bench/logs
 
   websocket:
-    image: frappe/erpnext:v16.14.0
+    image: frappe/erpnext:v16.15.0
     networks:
       - frappe_network
     deploy: