diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 82cc70790f..647d103f0f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -314,7 +314,7 @@ jobs:
     steps:
       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
         with:
-          merge-disk-volumes: true
+          merge-disk-volumes: false
           root-reserve-mb: 16384
           remove-android: 'true'
           remove-codeql: 'true'
diff --git a/.github/workflows/master_release.yml b/.github/workflows/master_release.yml
index 5552451ce2..e95ac358c7 100644
--- a/.github/workflows/master_release.yml
+++ b/.github/workflows/master_release.yml
@@ -22,8 +22,8 @@ env:
   GITHUB_ACTIONS_DEPLOY_TIMEOUT: 60
   BASE_BUILD_NUMBER: 10000
     # Release version has to start with real version (23.2.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 25.4.0-A2
-  DEVELOPMENT_VERSION: 25.4.0-A3-SNAPSHOT
+  RELEASE_VERSION: 25.4.0-A3
+  DEVELOPMENT_VERSION: 25.4.0-A4-SNAPSHOT
 
 jobs:
   run_ci: