diff --git a/.github/workflows/build.yml b/.github/workflows/4.x-build.yml
similarity index 86%
rename from .github/workflows/build.yml
rename to .github/workflows/4.x-build.yml
index 8b100c92af..8c6a2edbc6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/4.x-build.yml
@@ -1,15 +1,15 @@
 # This is a basic workflow to help you get started with Actions
 
-name: GeoNode Client CI (build)
+name: GeoNode Client 4.x CI (build)
 
 concurrency: 
-  group: "client_build"
+  group: "client_build_4.x"
   cancel-in-progress: true
 # Controls when the workflow will run
 on:
-  # Triggers the workflow on push events but only for the master branch
+  # Triggers the workflow on push events but only for the 4.x branch
   push:
-    branches: [ master ]
+    branches: [ 4.x ]
     paths: 
       - "geonode_mapstore_client/client/**"
       - "!geonode_mapstore_client/client/version.txt"
@@ -80,6 +80,8 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         with:
           token: ${{ steps.generate-token.outputs.token }}
-          base: "master"
-          title: "new client build"
-          body: "Automated client build from GeoNode Client CI"
+          base: "4.x"
+          title: "[4.x] new client build"
+          body: "Automated client build from GeoNode Client 4.x CI"
+          branch: "4.x-create-pull-request/patch"
+  
diff --git a/.github/workflows/test.yml b/.github/workflows/4.x-test.yml
similarity index 92%
rename from .github/workflows/test.yml
rename to .github/workflows/4.x-test.yml
index e6641bfaad..109b4b064d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/4.x-test.yml
@@ -1,12 +1,12 @@
 # This is a basic workflow to help you get started with Actions
 
-name: GeoNode Client CI (tests)
+name: GeoNode Client 4.x CI (tests)
 
 # Controls when the workflow will run
 on:
-  # Triggers the workflow pull request events but only for the master branch
+  # Triggers the workflow pull request events but only for the 4.x branch
   pull_request:
-    branches: [ master ]
+    branches: [ 4.x ]
     paths: 
       - "geonode_mapstore_client/client/**"