diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index e5bcccce..3c1ea8e2 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -32,7 +32,9 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           # Only release production modules, exclude all sample modules
-          mvn -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am -batch-mode release:prepare release:perform --file pom.xml
+          # Pass -pl/-am to forked Maven invocations via -Darguments
+          mvn -B -batch-mode release:prepare release:perform --file pom.xml \
+            -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am"
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f27ee3b..a7baea5a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -95,10 +95,12 @@ jobs:
           # Run release:prepare with explicit release version
           # Maven will automatically calculate the next development version
           # Only prepare production modules, exclude all sample modules
-          ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:prepare \
+          # Pass -pl/-am to forked Maven invocations via -Darguments
+          ./mvnw -B release:prepare \
             -DreleaseVersion="${VERSION}" \
             -Dtag="${TAG_NAME}" \
-            -DpushChanges=false
+            -DpushChanges=false \
+            -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am"
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
@@ -110,9 +112,11 @@ jobs:
           
           # Run release:perform to build and deploy
           # Only release production modules, exclude all sample modules
-          ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:perform \
+          # Pass -pl/-am to forked Maven invocations via -Darguments
+          ./mvnw -B release:perform \
             -DlocalCheckout=true \
-            -DeployAtEnd=true
+            -DeployAtEnd=true \
+            -Darguments="-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am"
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}