diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 486eea6a27..ed02745f78 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -31,13 +31,13 @@ jobs:
 
     - name: Build
       run: |
-        mvn -B clean package -Padvanced -DskipTests
-        artifact_zip=`ls $(pwd)/target/releases/opensearch-security-*.zip | grep -v admin-standalone`
-        ./gradlew build buildDeb buildRpm --no-daemon -ParchivePath=$artifact_zip -Dbuild.snapshot=false
+        ./gradlew clean build --no-daemon -Dbuild.snapshot=false -x test
+        artifact_zip=`ls $(pwd)/build/distributions/opensearch-security-*.zip | grep -v admin-standalone`
+        ./gradlew build buildDeb buildRpm --no-daemon -ParchivePath=$artifact_zip -Dbuild.snapshot=false -x test
         mkdir artifacts
         cp $artifact_zip artifacts/
-        cp gradle-build/distributions/*.deb artifacts/
-        cp gradle-build/distributions/*.rpm artifacts/
+        cp build/distributions/*.deb artifacts/
+        cp build/distributions/*.rpm artifacts/
         zip -r artifacts.zip artifacts
         echo "TAG_VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a2ccd2d4b..c3fb3adf01 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,16 +44,16 @@ jobs:
         restore-keys: ${{ runner.os }}-m2
 
     - name: Checkstyle
-      run: mvn -B checkstyle:checkstyle
+      run: ./gradlew clean checkstyleMain checkstyleTest --no-daemon
 
     - name: Package
-      run: mvn -B clean package -Padvanced -DskipTests
+      run: ./gradlew clean build --no-daemon -Dbuild.snapshot=false -x test
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
 
     - name: Test
-      run: OPENDISTRO_SECURITY_TEST_OPENSSL_OPT=true mvn -B test
+      run: ./gradlew test --no-daemon
 
     - name: Coverage
       uses: codecov/codecov-action@v1
@@ -64,4 +64,4 @@ jobs:
       uses: actions/upload-artifact@v1
       with:
         name: artifacts
-        path: target/releases/
+        path: build/distributions/