diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
index 0275a185..635dd394 100644
--- a/.github/workflows/ci-pr.yml
+++ b/.github/workflows/ci-pr.yml
@@ -6,11 +6,27 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: CI PR Build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - nickname: linux jdk8
+            java: 8
+            disable-samples: true
+          - nickname: linux jdk11
+            java: 11
+            disable-samples: false
+          - nickname: linux jdk17
+            java: 17
+            disable-samples: false
+    name: CI PR ${{ matrix.nickname }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
           distribution: adopt
           java-version: 8
-      - run: ./mvnw -B package
+      - name: Build
+        env:
+          DISABLE_SAMPLES: ${{ matrix.disable-samples }}
+        run: ./mvnw -B package
diff --git a/.github/workflows/ci-publish.yml b/.github/workflows/ci-publish.yml
index 2467a077..8433a273 100644
--- a/.github/workflows/ci-publish.yml
+++ b/.github/workflows/ci-publish.yml
@@ -33,6 +33,8 @@ jobs:
         echo JFROG_CLI_BUILD_NAME=spring-shell-main >> $GITHUB_ENV
         echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
     - name: Build and Publish
+      env:
+        DISABLE_SAMPLES: true
       run: |
         jfrog rt mvn clean install -B -DskipTests
         jfrog rt build-publish
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27f91c57..61dab0a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,8 +12,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '8', '11', '17' ]
-    name: CI Build ${{ matrix.java }}
+        include:
+          - nickname: linux jdk8
+            java: 8
+            disable-samples: true
+          - nickname: linux jdk11
+            java: 11
+            disable-samples: false
+          - nickname: linux jdk17
+            java: 17
+            disable-samples: false
+    name: CI Build ${{ matrix.nickname }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
@@ -21,8 +30,12 @@ jobs:
           distribution: adopt
           java-version: ${{ matrix.java }}
           cache: maven
-      - run: ./mvnw -B package
+      - name: Build
+        env:
+          DISABLE_SAMPLES: ${{ matrix.disable-samples }}
+        run: ./mvnw -B package
   publish:
+    if: github.repository_owner == 'spring-projects'
     needs: [build]
     name: Call Publish Snapshot
     uses: spring-projects/spring-shell/.github/workflows/ci-publish.yml@main
diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml
index 71b2e3fe..9294a5e5 100644
--- a/.github/workflows/release-milestone.yml
+++ b/.github/workflows/release-milestone.yml
@@ -43,6 +43,8 @@ jobs:
           -B
         echo PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
     - name: Build and Publish
+      env:
+        DISABLE_SAMPLES: true
       run: |
         jfrog rt build-clean
         jfrog rt mvn clean install \
diff --git a/pom.xml b/pom.xml
index 8d89382c..b2342383 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,8 @@
 			<id>samples</id>
 			<activation>
 				<property>
-					<name>!env.DISABLE_SAMPLES</name>
+					<name>env.DISABLE_SAMPLES</name>
+					<value>!true</value>
 				</property>
 			</activation>
 			<modules>