diff --git a/codebuild/ci/release-ci.yml b/codebuild/ci/release-ci.yml
index 0b4fd35b..35740e90 100644
--- a/codebuild/ci/release-ci.yml
+++ b/codebuild/ci/release-ci.yml
@@ -35,14 +35,9 @@ phases:
       - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-CI --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz
       - tar -xvf ~/mvn_gpg.tgz -C ~
 
-      # Build and deploy to maven local
-      - cd submodules/MaterialProviders
-      - git checkout $BRANCH
-      - cd TestVectorsAwsCryptographicMaterialProviders/
-      # This works because `node` is installed by default on GHA runners
-      - CORES=$(node -e 'console.log(os.cpus().length)')
-      - make build_java CORES=$CORES
-      - ./runtimes/java/gradlew -p runtimes/java publishMavenLocalPublicationToMavenLocal
+      # Build and deploy TestVectors to maven local
+      - cd submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/
+      - make build_java && make mvn_local_deploy
       - cd $CODEBUILD_SRC_DIR
 
   build:
diff --git a/codebuild/ci/vectors-ci.yml b/codebuild/ci/vectors-ci.yml
index 0ff26ab7..950c1f5c 100644
--- a/codebuild/ci/vectors-ci.yml
+++ b/codebuild/ci/vectors-ci.yml
@@ -25,13 +25,8 @@ phases:
       - aws sts get-caller-identity
 
       # Build and deploy TestVectors to maven local
-      - cd submodules/MaterialProviders
-      - git checkout $BRANCH
-      - cd TestVectorsAwsCryptographicMaterialProviders/
-      # This works because `node` is installed by default on GHA runners
-      - CORES=$(node -e 'console.log(os.cpus().length)')
-      - make build_java CORES=$CORES
-      - ./runtimes/java/gradlew -p runtimes/java publishMavenLocalPublicationToMavenLocal
+      - cd submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/
+      - make build_java && make mvn_local_deploy
       - cd $CODEBUILD_SRC_DIR
   build:
     commands:
diff --git a/codebuild/ci/vectors-generator.yml b/codebuild/ci/vectors-generator.yml
index f219a55c..1b987762 100644
--- a/codebuild/ci/vectors-generator.yml
+++ b/codebuild/ci/vectors-generator.yml
@@ -28,14 +28,9 @@ phases:
       - export AWS_SESSION_TOKEN=$(echo "${TMP_ROLE}" | jq -r '.Credentials.SessionToken')
       - aws sts get-caller-identity
 
-      # Build and deploy to maven local
-      - cd submodules/MaterialProviders
-      - git checkout $BRANCH
-      - cd TestVectorsAwsCryptographicMaterialProviders/
-      # This works because `node` is installed by default on GHA runners
-      - CORES=$(node -e 'console.log(os.cpus().length)')
-      - make build_java CORES=$CORES
-      - ./runtimes/java/gradlew -p runtimes/java publishMavenLocalPublicationToMavenLocal
+      # Build and deploy TestVectors to maven local
+      - cd submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/
+      - make build_java && make mvn_local_deploy
       - cd $CODEBUILD_SRC_DIR
   build:
     commands:
diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml
index 0989e64f..b15b5c3f 100644
--- a/codebuild/release/release-prod.yml
+++ b/codebuild/release/release-prod.yml
@@ -32,14 +32,9 @@ phases:
       - export SETTINGS_FILE=$(pwd)/codebuild/release/settings.xml
       - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-Release --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz
       - tar -xvf ~/mvn_gpg.tgz -C ~
-      # Build and deploy TestVectorsAwsCryptographicMaterialProviders to maven local
-      - cd submodules/MaterialProviders
-      - git checkout $BRANCH
-      - cd TestVectorsAwsCryptographicMaterialProviders/
-      # This works because `node` is installed by default on GHA runners
-      - CORES=$(node -e 'console.log(os.cpus().length)')
-      - make build_java CORES=$CORES
-      - ./runtimes/java/gradlew -p runtimes/java publishMavenLocalPublicationToMavenLocal
+      # Build and deploy TestVectors to maven local
+      - cd submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/
+      - make build_java && make mvn_local_deploy
       - cd $CODEBUILD_SRC_DIR
   build:
     commands:
diff --git a/codebuild/release/release-staging.yml b/codebuild/release/release-staging.yml
index f2246a2e..2397b5d0 100644
--- a/codebuild/release/release-staging.yml
+++ b/codebuild/release/release-staging.yml
@@ -35,14 +35,9 @@ phases:
       - export CODEARTIFACT_REPO_URL=https://${DOMAIN}-${ACCOUNT}.d.codeartifact.${REGION}.amazonaws.com/maven/${REPOSITORY}
       - aws secretsmanager get-secret-value --region us-west-2 --secret-id Maven-GPG-Keys-Release --query SecretBinary --output text | base64 -d > ~/mvn_gpg.tgz
       - tar -xvf ~/mvn_gpg.tgz -C ~
-      # Build and deploy TestVectorsAwsCryptographicMaterialProviders to maven local
-      - cd submodules/MaterialProviders
-      - git checkout $BRANCH
-      - cd TestVectorsAwsCryptographicMaterialProviders/
-      # This works because `node` is installed by default on GHA runners
-      - CORES=$(node -e 'console.log(os.cpus().length)')
-      - make build_java CORES=$CORES
-      - ./runtimes/java/gradlew -p runtimes/java publishMavenLocalPublicationToMavenLocal
+      # Build and deploy TestVectors to maven local
+      - cd submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/
+      - make build_java && make mvn_local_deploy
       - cd $CODEBUILD_SRC_DIR
   build:
     commands: