diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 934eef12..e5bcccce 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -31,7 +31,8 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          mvn -B -batch-mode release:prepare release:perform --file pom.xml
+          # 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
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index adf169ce..5f27ee3b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -94,7 +94,8 @@ jobs:
           
           # Run release:prepare with explicit release version
           # Maven will automatically calculate the next development version
-          ./mvnw -B release:prepare \
+          # Only prepare production modules, exclude all sample modules
+          ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:prepare \
             -DreleaseVersion="${VERSION}" \
             -Dtag="${TAG_NAME}" \
             -DpushChanges=false
@@ -108,7 +109,8 @@ jobs:
           echo "Performing release and deploying to Maven Central"
           
           # Run release:perform to build and deploy
-          ./mvnw -B release:perform \
+          # Only release production modules, exclude all sample modules
+          ./mvnw -B -pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am release:perform \
             -DlocalCheckout=true \
             -DeployAtEnd=true
         env:
diff --git a/pom.xml b/pom.xml
index db35a478..cf2ade43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,8 +254,6 @@
           <useReleaseProfile>false</useReleaseProfile>
           <releaseProfiles>release</releaseProfiles>
           <goals>deploy</goals>
-          <!-- Only release production modules, exclude all sample modules -->
-          <arguments>-pl xapi-model,xapi-client,xapi-model-spring-boot-starter -am</arguments>
         </configuration>
       </plugin>
     </plugins>