diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml
index 212272d2c053..9fd84daef63b 100644
--- a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml
+++ b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_ARM.yml
@@ -60,7 +60,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-        job_name: [beam_PostCommit_Java_Examples__Dataflow_ARM]
+        job_name: [beam_PostCommit_Java_Examples_Dataflow_ARM]
         job_phrase: [Run Java_Examples_Dataflow_ARM PostCommit]
         java_version: ['8','11','17','21']
     if: |
@@ -80,7 +80,9 @@ jobs:
       - name: Setup environment
         uses: ./.github/actions/setup-environment-action
         with:
-          java-version: ${{ matrix.java_version }}
+          java-version: |
+            ${{ matrix.java_version != '11' && matrix.java_version || '' }}
+            11
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: GCloud Docker credential helper
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/transforms/CoGroup.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/transforms/CoGroup.java
index 60757a003396..93381034e133 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/transforms/CoGroup.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/transforms/CoGroup.java
@@ -204,11 +204,10 @@
  * <p>Do note that cross-product joins while simpler and easier to program, can cause performance problems.
  */
 @SuppressWarnings({
-  "nullness", // TODO(https://github.com/apache/beam/issues/20497)
-  "rawtypes"
+  "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
 public class CoGroup {
-  private static final List NULL_LIST;
+  private static final List<@Nullable Row> NULL_LIST;
 
   static {
     NULL_LIST = Lists.newArrayList();
@@ -405,7 +404,7 @@ private static JoinInformation from(
         FieldAccessDescriptor resolved = fieldAccessDescriptor.resolve(schema);
 
         // Create a new tag for the output.
-        TupleTag randomTag = new TupleTag<>();
+        TupleTag<?> randomTag = new TupleTag<>();
         String keyedTag = tag + "_" + randomTag;
         tagToKeyedTag.put(tagIndex, keyedTag);
         PCollection<KV<Row, Row>> keyedPCollection =
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Watch.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Watch.java
index 3f9423610dfa..793fac048dff 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Watch.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Watch.java
@@ -124,8 +124,7 @@
  * href="https://beam.apache.org/documentation/runners/capability-matrix/">capability matrix</a>.
  */
 @SuppressWarnings({
-  "nullness", // TODO(https://github.com/apache/beam/issues/20497)
-  "rawtypes"
+  "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
 public class Watch {
   private static final Logger LOG = LoggerFactory.getLogger(Watch.class);
@@ -975,7 +974,7 @@ private HashCode hash128(OutputT value) {
       return Hashing.murmur3_128().hashObject(value, coderFunnel);
     }
 
-    private Growth.PollResult computeNeverSeenBeforeResults(
+    private Growth.PollResult<OutputT> computeNeverSeenBeforeResults(
         PollingGrowthState<TerminationStateT> state, Growth.PollResult<OutputT> pollResult) {
       // Collect results to include as newly pending. Note that the poll result may in theory
       // contain multiple outputs mapping to the same output key - we need to ignore duplicates
@@ -1036,7 +1035,7 @@ abstract static class GrowthState {}
   @VisibleForTesting
   abstract static class NonPollingGrowthState<OutputT> extends GrowthState {
     public static <OutputT> NonPollingGrowthState<OutputT> of(Growth.PollResult<OutputT> pending) {
-      return new AutoValue_Watch_NonPollingGrowthState(pending);
+      return new AutoValue_Watch_NonPollingGrowthState<>(pending);
     }
 
     /**
@@ -1056,14 +1055,14 @@ public static <OutputT> NonPollingGrowthState<OutputT> of(Growth.PollResult<Outp
   abstract static class PollingGrowthState<TerminationStateT> extends GrowthState {
     public static <TerminationStateT> PollingGrowthState<TerminationStateT> of(
         TerminationStateT terminationState) {
-      return new AutoValue_Watch_PollingGrowthState(ImmutableMap.of(), null, terminationState);
+      return new AutoValue_Watch_PollingGrowthState<>(ImmutableMap.of(), null, terminationState);
     }
 
     public static <TerminationStateT> PollingGrowthState<TerminationStateT> of(
         ImmutableMap<HashCode, Instant> completed,
         Instant pollWatermark,
         TerminationStateT terminationState) {
-      return new AutoValue_Watch_PollingGrowthState(completed, pollWatermark, terminationState);
+      return new AutoValue_Watch_PollingGrowthState<>(completed, pollWatermark, terminationState);
     }
 
     // Hashes and timestamps of outputs that have already been output and should be omitted