diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4ef87ee112..563aebd7055 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -228,6 +228,7 @@ jobs:
           )          
           df -h
           wmic pagefile list /format:list
+          set "SKIP_EXPORT=true"
           echo Executing Maven %MAVEN_PHASE%
           call mvn clean %MAVEN_PHASE% -B -U -e -Djavacpp.platform=windows-x86_64 -Djavacpp.platform.extension=${{ matrix.ext }} -pl %NATIVE_BUILD_PROJECTS% -am -DstagingRepositoryId=${{ needs.prepare.outputs.stagingRepositoryId }} "-Dnative.build.flags=%BAZEL_CACHE%"
           if ERRORLEVEL 1 exit /b
diff --git a/tensorflow-core/tensorflow-core-api/build.sh b/tensorflow-core/tensorflow-core-api/build.sh
index 94d8abbfd20..b1c5194214f 100755
--- a/tensorflow-core/tensorflow-core-api/build.sh
+++ b/tensorflow-core/tensorflow-core-api/build.sh
@@ -82,10 +82,15 @@ mkdir -p $GEN_SRCS_DIR
 GEN_RESOURCE_DIR=src/gen/resources/org/tensorflow/op
 mkdir -p $GEN_RESOURCE_DIR
 
-# Export op defs
-$BAZEL_BIN/java_op_exporter \
-    --api_dirs=$BAZEL_SRCS/external/org_tensorflow/tensorflow/core/api_def/base_api,src/bazel/api_def \
-    $TENSORFLOW_LIB > $GEN_RESOURCE_DIR/ops.pb
+if [[ -z "${SKIP_EXPORT:-}" ]]; then
+  # Export op defs
+  echo "Exporting Ops"
+  $BAZEL_BIN/java_op_exporter \
+      --api_dirs=$BAZEL_SRCS/external/org_tensorflow/tensorflow/core/api_def/base_api,src/bazel/api_def \
+      $TENSORFLOW_LIB > $GEN_RESOURCE_DIR/ops.pb
+else
+  echo "Skipping Op export"
+fi
 
 
 # Copy generated Java protos from source jars