diff --git a/.github/scripts/create-release.sh b/.github/scripts/create-release.sh
index 9bfe8d7e1..e32ddb39b 100755
--- a/.github/scripts/create-release.sh
+++ b/.github/scripts/create-release.sh
@@ -84,27 +84,27 @@ fi
 echo "$RELEASE_BRANCH branch is ready."
 
 if [ `git rev-parse --verify $RELEASE_TAG 2>/dev/null` ]; then
-  echo "$RELEASE_TAG tag already exists, aborting ..."
-  exit 2
+  echo "$RELEASE_TAG tag already exists, checking it out ..."
+  git checkout $RELEASE_TAG
+else
+  ${script_dir}/update_sdk_version.sh $REL_VERSION
+  git commit -s -m "Release $REL_VERSION" -a
+  if [ "$VARIANT" = "" ]; then
+    echo "Generating docs ..."
+    ${script_dir}/update_docs.sh $REL_VERSION
+    git commit -s -m "Generate updated javadocs for $REL_VERSION" -a
+  fi
+  git push origin $RELEASE_BRANCH
+
+  echo "Tagging $RELEASE_TAG ..."
+  git tag $RELEASE_TAG
+  echo "$RELEASE_TAG is tagged."
+
+  echo "Pushing $RELEASE_TAG tag ..."
+  git push origin $RELEASE_TAG
+  echo "$RELEASE_TAG tag is pushed."
 fi
 
-${script_dir}/update_sdk_version.sh $REL_VERSION
-git commit -s -m "Release $REL_VERSION" -a
-if [ "$VARIANT" = "" ]; then
-  echo "Generating docs ..."
-  ${script_dir}/update_docs.sh $REL_VERSION
-  git commit -s -m "Generate updated javadocs for $REL_VERSION" -a
-fi
-git push origin $RELEASE_BRANCH
-
-echo "Tagging $RELEASE_TAG ..."
-git tag $RELEASE_TAG
-echo "$RELEASE_TAG is tagged."
-
-echo "Pushing $RELEASE_TAG tag ..."
-git push origin $RELEASE_TAG
-echo "$RELEASE_TAG tag is pushed."
-
 if [ "$VARIANT" = "" ]; then
   git clean -xdf
   echo "Creating pull request to update docs ..."
diff --git a/.github/scripts/update_docs.sh b/.github/scripts/update_docs.sh
index aacc4ccb7..21c6bddc7 100755
--- a/.github/scripts/update_docs.sh
+++ b/.github/scripts/update_docs.sh
@@ -27,5 +27,5 @@ rm -f daprdocs/content/en/java-sdk-docs/_index.mdbak || echo
 rm -f daprdocs/content/en/java-sdk-docs/spring-boot/_index.md/_index.mdbak || echo
 
 rm -rf docs
-./mvnw -Dmaven.test.skip=false -Djacoco.skip=true clean install
-./mvnw site-deploy
+./mvnw -Dmaven.test.skip=true -Djacoco.skip=true clean install
+./mvnw -Dmaven.test.skip=true -Djacoco.skip=true site-deploy