diff --git a/oci-service-broker/build.gradle b/oci-service-broker/build.gradle
index 8ab5c90..b486834 100644
--- a/oci-service-broker/build.gradle
+++ b/oci-service-broker/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 plugins {
     id "com.github.hierynomus.license" version "0.15.0"
-    id "com.github.spotbugs" version "1.6.4"
+    id "com.github.spotbugs" version "2.0.0"
 }
 
 apply plugin: 'java'
diff --git a/oci-service-broker/download_SDK_libs.sh b/oci-service-broker/download_SDK_libs.sh
index a4267ce..33605f5 100755
--- a/oci-service-broker/download_SDK_libs.sh
+++ b/oci-service-broker/download_SDK_libs.sh
@@ -17,7 +17,7 @@ mkdir -p ${SCRIPT_DIR}/libs
 echo "Downloading oci-java-sdk version v${SDK_VERSION} and the dependent libraries..."
 curl -sSL https://github.com/oracle/oci-java-sdk/releases/download/v${SDK_VERSION}/oci-java-sdk-${SDK_VERSION}.zip -o ${TEMP_DIR}/oci-java-sdk.zip
 unzip -qq ${TEMP_DIR}/oci-java-sdk.zip -d ${TEMP_DIR}
-cp ${TEMP_DIR}/lib/oci-java-sdk-full-1.28.0.jar ${SCRIPT_DIR}/libs/
+cp ${TEMP_DIR}/lib/oci-java-sdk-full-${SDK_VERSION}.jar ${SCRIPT_DIR}/libs/
 cp ${TEMP_DIR}/third-party/lib/*.jar  ${SCRIPT_DIR}/libs/
 rm -rf ${TEMP_DIR}
 echo "oci-java-sdk and the dependent libraries are downloaded to ${SCRIPT_DIR}/libs directory"