diff --git a/.github/scripts/mvn_build_affected_only.sh b/.github/scripts/build_affected_only.sh
similarity index 72%
rename from .github/scripts/mvn_build_affected_only.sh
rename to .github/scripts/build_affected_only.sh
index 4ec0a0e6b8..3b468b066b 100755
--- a/.github/scripts/mvn_build_affected_only.sh
+++ b/.github/scripts/build_affected_only.sh
@@ -21,38 +21,12 @@ if [ "$#" -lt 2 ]; then
     exit 1
 fi
 
-git fetch
-
-ALL_MODULES=$(find . -name pom.xml | cut -d '/' -f 2 )
 MODULES=$(git diff --name-only "$1" | cut -d '/' -f 1 | sort -u | sed -n -e 'H;${x;s/\n/,/g;s/^,//;p;}')
 MAVEN_ARGUMENTS=${*:2}
 if [ -z "$MODULES" ]; then
   echo "No changes detected, skipping build"
   exit 0
 fi
-
-ALL_MODULES_ARRAY=($ALL_MODULES)
-MODULES_ARRAY=($MODULES)
-
-for module in "${MODULES_ARRAY[@]}"
-do
-  found=0;
-  for m in "${ALL_MODULES_ARRAY[@]}"
-  do
-    if [ "$module" == "$m" ]; then
-      found=1;
-      break
-    fi
-  done
-
-  if [ "$found" != 1 ]; then
-    echo "Can't detect module that changed, run a full build"
-    echo "./mvnw $MAVEN_ARGUMENTS"
-    ./mvnw "${@:2}"
-    exit 0
-  fi
-done
-
 echo "Changes detected, start the build"
 echo "./mvnw -pl $MODULES -amd $MAVEN_ARGUMENTS"
 ./mvnw -pl "$MODULES" -amd "${@:2}"
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 77b7dc59d3..cc2ad89314 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -135,16 +135,16 @@ jobs:
         include:
           - setup: linux-x86_64-java8
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml build"
-            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml run partly-build-leak"
+            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml run build-leak"
           - setup: linux-x86_64-java11
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
-            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run partly-build-leak"
+            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak"
           - setup: linux-x86_64-java11-graal
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.graalvm111.yaml build"
-            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.graalvm111.yaml run partly-build-leak"
+            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.graalvm111.yaml run build-leak"
           - setup: linux-x86_64-java16
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml build"
-            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml run partly-build-leak"
+            docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml run build-leak"
           - setup: linux-x86_64-java11-boringssl
             docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
             docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak-boringssl-static"
@@ -177,8 +177,6 @@ jobs:
         run: docker-compose ${{ matrix.docker-compose-build }}
 
       - name: Build project with leak detection
-        env:
-          BRANCH: origin/${{ github.base_ref }}
         run: docker-compose ${{ matrix.docker-compose-run }} | tee build-leak.output
 
       - name: Checking for test failures
diff --git a/docker/docker-compose.centos-6.111.yaml b/docker/docker-compose.centos-6.111.yaml
index 1903bf0675..e422c9592d 100644
--- a/docker/docker-compose.centos-6.111.yaml
+++ b/docker/docker-compose.centos-6.111.yaml
@@ -22,9 +22,3 @@ services:
 
   shell:
     image: netty:centos-6-1.11
-
-  partly-build-leak:
-    image: netty:centos-6-1.11
-
-  partly-build-leak-boringssl-static:
-    image: netty:centos-6-1.11
diff --git a/docker/docker-compose.centos-6.116.yaml b/docker/docker-compose.centos-6.116.yaml
index acd2a28310..40f2976730 100644
--- a/docker/docker-compose.centos-6.116.yaml
+++ b/docker/docker-compose.centos-6.116.yaml
@@ -22,9 +22,3 @@ services:
 
   shell:
     image: netty:centos-6-1.16
-
-  partly-build-leak:
-    image: netty:centos-6-1.16
-
-  partly-build-leak-boringssl-static:
-    image: netty:centos-6-1.16
diff --git a/docker/docker-compose.centos-6.18.yaml b/docker/docker-compose.centos-6.18.yaml
index 11f2e19122..4729d07c1a 100644
--- a/docker/docker-compose.centos-6.18.yaml
+++ b/docker/docker-compose.centos-6.18.yaml
@@ -31,9 +31,3 @@ services:
 
   shell:
     image: netty:centos-6-1.8
-
-  partly-build-leak:
-    image: netty:centos-6-1.8
-
-  partly-build-leak-boringssl-static:
-    image: netty:centos-6-1.8
diff --git a/docker/docker-compose.centos-6.graalvm111.yaml b/docker/docker-compose.centos-6.graalvm111.yaml
index 700793917d..822a98e45f 100644
--- a/docker/docker-compose.centos-6.graalvm111.yaml
+++ b/docker/docker-compose.centos-6.graalvm111.yaml
@@ -22,9 +22,3 @@ services:
 
   shell:
     image: netty:centos-6-1.11
-
-  partly-build-leak:
-    image: netty:centos-6-1.11
-
-  partly-build-leak-boringssl-static:
-    image: netty:centos-6-1.11
diff --git a/docker/docker-compose.centos-6.graalvm18.yaml b/docker/docker-compose.centos-6.graalvm18.yaml
index 9e62924686..d84cf11640 100644
--- a/docker/docker-compose.centos-6.graalvm18.yaml
+++ b/docker/docker-compose.centos-6.graalvm18.yaml
@@ -22,9 +22,3 @@ services:
 
   shell:
     image: netty:centos-6-1.8
-
-  partly-build-leak:
-    image: netty:centos-6-1.8
-
-  partly-build-leak-boringssl-static:
-    image: netty:centos-6-1.8
diff --git a/docker/docker-compose.centos-6.openj9111.yaml b/docker/docker-compose.centos-6.openj9111.yaml
index b3fc8398b9..e59a3d03be 100644
--- a/docker/docker-compose.centos-6.openj9111.yaml
+++ b/docker/docker-compose.centos-6.openj9111.yaml
@@ -22,9 +22,3 @@ services:
 
   shell:
     image: netty:centos-6-openj9-1.11
-
-  partly-build-leak:
-    image: netty:centos-6-openj9-1.11
-
-  partly-build-leak-boringssl-static:
-    image: netty:centos-6-openj9-1.11
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 132510f8e3..bf759fd3af 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -16,7 +16,6 @@ services:
       - GPG_PASSPHRASE
       - GPG_PRIVATE_KEY
       - MAVEN_OPTS
-      - BRANCH
     volumes:
       - ~/.ssh:/root/.ssh
       - ~/.gnupg:/root/.gnupg
@@ -28,10 +27,6 @@ services:
     <<: *common
     command: /bin/bash -cl "./mvnw -B -ntp -Pleak clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.classifier=linux-x86_64-fedora"
 
-  partly-build-leak:
-    <<: *common
-    command: /bin/bash -cl "./.github/scripts/mvn_build_affected_only.sh ${BRANCH} -B -ntp -Pleak clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.classifier=linux-x86_64-fedora"
-
   build:
     <<: *common
     command: /bin/bash -cl "./mvnw -B -ntp clean install -Dio.netty.testsuite.badHost=netty.io -Dtcnative.classifier=linux-x86_64-fedora"
@@ -67,11 +62,6 @@ services:
     <<: *common
     command: /bin/bash -cl "./mvnw -B -ntp -Pboringssl,leak clean install -Dio.netty.testsuite.badHost=netty.io -Dxml.skip=true"
 
-
-  partly-build-leak-boringssl-static:
-    <<: *common
-    command: /bin/bash -cl "./.github/scripts/mvn_build_affected_only.sh ${BRANCH} -B -ntp -Pboringssl,leak clean install -Dio.netty.testsuite.badHost=netty.io -Dxml.skip=true"
-
   shell:
     <<: *common
     entrypoint: /bin/bash