diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c765f4c81..b643ada24 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -72,10 +72,10 @@ jobs:
       - name: Check Javaagent Plugin List
         run: tools/plugin/check-javaagent-plugin-list.sh
       - name: Install and Test
-        if: matrix.java-version == '8'
+        if: matrix.java-version == '8' && matrix.os != 'windows'
         run: ./mvnw -q --batch-mode clean verify install javadoc:javadoc
       - name: Install and Test
-        if: matrix.java-version == '11'
+        if: matrix.java-version == '11' || matrix.os == 'windows'
         run: ./mvnw -q --batch-mode clean verify install
 
   ci:
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index 9f332277c..dad3a2037 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -23,18 +23,23 @@ on:
 
 env:
   SKIP_TEST: true
-  NAME: skywalking-java
   HUB: ghcr.io/apache/skywalking-java
 
 jobs:
   build:
     if: github.repository == 'apache/skywalking-java'
+    name: Build and Push Docker
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
     timeout-minutes: 60
+    strategy:
+      matrix:
+        java-version: [ 8, 9, 10, 11, 12, 13, 14, 15, 16 ]
     env:
+      BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.java-version }}:alpine
+      NAME: jdk-${{ matrix.java-version }}
       TAG: ${{ github.sha }}
     steps:
       - uses: actions/checkout@v2