diff --git a/BuildOpenSSL.cmake b/BuildOpenSSL.cmake
index 3af86e3..141622e 100644
--- a/BuildOpenSSL.cmake
+++ b/BuildOpenSSL.cmake
@@ -2,14 +2,14 @@ include(ExternalProject)
 set(OPENSSL_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/openssl-src) # default path by CMake
 set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/openssl)
 set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include)
+set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure no-shared)
 
 if (WIN32)
-    set(OPENSSL_CONFIGURE_COMMAND perl ${OPENSSL_SOURCE_DIR}/Configure VC-WIN64A)
+    set(OPENSSL_CONFIGURE_COMMAND perl ${OPENSSL_CONFIGURE_COMMAND})
     set(OPENSSL_BUILD_COMMAND nmake /S)
-    set(OPENSSL_INSTALL_COMMAND nmake install /S)
+    set(OPENSSL_INSTALL_COMMAND nmake install_sw /S)
     set(OPENSSL_LIBRARY_EXTENSION .lib)
 else ()
-    set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure)
     set(OPENSSL_BUILD_COMMAND make)
     set(OPENSSL_INSTALL_COMMAND make install)
     set(OPENSSL_LIBRARY_EXTENSION .a)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36b4ab8..1526da1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,10 +20,10 @@ find_package(re2 CONFIG REQUIRED)
 find_package(c-ares CONFIG REQUIRED)
 find_package(absl CONFIG REQUIRED)
 
-set(HAPI_VERSION_TAG "v0.30.0" CACHE STRING "Use the configured version tag for the Hedera API protobufs")
+set(HAPI_VERSION_TAG "v0.31.0" CACHE STRING "Use the configured version tag for the Hedera API protobufs")
 
 if (HAPI_VERSION_TAG STREQUAL "")
-    set(HAPI_VERSION_TAG "v0.30.0")
+    set(HAPI_VERSION_TAG "v0.31.0")
 endif ()
 
 # Fetch the protobuf definitions