diff --git a/CMakeLists.txt b/CMakeLists.txt
index c81b65f8..d80b197f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,10 +16,9 @@ set(SWG_EXTERNALS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
 set(SWG_EXTERNALS_FIND ${CMAKE_CURRENT_SOURCE_DIR}/external/3rd/library)
 set(SWG_GAME_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/game)
 
-include_directories(/usr/include/i386-linux-gnu)
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
 
+include_directories(/usr/include/i386-linux-gnu)
 find_package(BISON REQUIRED)
 find_package(FLEX REQUIRED)
 find_package(JNI REQUIRED)
@@ -30,7 +29,10 @@ find_package(Perl REQUIRED)
 find_package(Threads)
 find_package(ZLIB REQUIRED)
 find_package(CURL REQUIRED)
-find_package(OpenSSL REQUIRED)
+find_library(OpenSSL REQUIRED)
+
+message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
+message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
 
 # c++14 yeah!
 set(CMAKE_CXX_STANDARD 14)
diff --git a/cmake/linux/FindJNI.cmake b/cmake/linux/FindJNI.cmake
index 57e63e3b..ac423a6f 100644
--- a/cmake/linux/FindJNI.cmake
+++ b/cmake/linux/FindJNI.cmake
@@ -89,6 +89,9 @@ get_filename_component(java_install_version
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
 
 set(JAVA_AWT_LIBRARY_DIRECTORIES
+  /opt/java/lib
+  /opt/java
+  /opt/java/jre
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
@@ -97,6 +100,11 @@ set(JAVA_AWT_LIBRARY_DIRECTORIES
 file(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME)
 
 JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+  /opt/java
+  /opt/java/jre
+  /opt/java/jre/lib
+  /opt/java/jre/bin
+  /opt/java/jre/bin/classic
   ${_JAVA_HOME}/jre/lib/{libarch}
   ${_JAVA_HOME}/jre/lib
   ${_JAVA_HOME}/jre/bin
@@ -152,11 +160,12 @@ endforeach()
 
 
 set(JAVA_AWT_INCLUDE_DIRECTORIES
+  /opt/java/jre/include
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
   ${_JAVA_HOME}/include
-  /opt/java17/include
+  /opt/java/include
   /opt/java17/jre/include
   /usr/include
   /usr/local/include
diff --git a/engine/server/application/CentralServer/src/CMakeLists.txt b/engine/server/application/CentralServer/src/CMakeLists.txt
index 4354e1ad..333d0b3d 100755
--- a/engine/server/application/CentralServer/src/CMakeLists.txt
+++ b/engine/server/application/CentralServer/src/CMakeLists.txt
@@ -154,7 +154,7 @@ include_directories(
     ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/projects
     ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/platform/utils
     ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/udplibrary
-	${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI
+    ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI
 )
 
 add_executable(CentralServer
@@ -191,7 +191,9 @@ target_link_libraries(CentralServer
     localizationArchive
     unicode
     unicodeArchive
-	webAPI
+    webAPI
+    ${OPENSSL_CRYPTO_LIBRARY}
+    ${OPENSSL_LIBRARIES}
     ${CURL_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )
diff --git a/engine/server/application/ConnectionServer/src/CMakeLists.txt b/engine/server/application/ConnectionServer/src/CMakeLists.txt
index 67a46a8a..8ea50e76 100644
--- a/engine/server/application/ConnectionServer/src/CMakeLists.txt
+++ b/engine/server/application/ConnectionServer/src/CMakeLists.txt
@@ -108,7 +108,9 @@ target_link_libraries(ConnectionServer
     Base
     CommonAPI
     LoginAPI
-	webAPI
-	${CURL_LIBRARIES}
+    webAPI
+    ${OPENSSL_CRYPTO_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${CURL_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )
diff --git a/engine/server/application/LogServer/src/CMakeLists.txt b/engine/server/application/LogServer/src/CMakeLists.txt
index 73393bcf..d54eb5c1 100644
--- a/engine/server/application/LogServer/src/CMakeLists.txt
+++ b/engine/server/application/LogServer/src/CMakeLists.txt
@@ -77,7 +77,9 @@ target_link_libraries(LogServer
     localizationArchive
     unicode
     unicodeArchive
-	webAPI
-	${CURL_LIBRARIES}
+    webAPI
+    ${OPENSSL_CRYPTO_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${CURL_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )
diff --git a/engine/server/application/LoginServer/src/CMakeLists.txt b/engine/server/application/LoginServer/src/CMakeLists.txt
index 03f39400..92b66174 100644
--- a/engine/server/application/LoginServer/src/CMakeLists.txt
+++ b/engine/server/application/LoginServer/src/CMakeLists.txt
@@ -52,8 +52,8 @@ set(SHARED_SOURCES
     shared/TaskGetClusterList.h
     shared/TaskGetValidationData.cpp
     shared/TaskGetValidationData.h
-	shared/TaskMapAccount.h
-	shared/TaskMapAccount.cpp
+    shared/TaskMapAccount.h
+    shared/TaskMapAccount.cpp
     shared/TaskRegisterNewCluster.cpp
     shared/TaskRegisterNewCluster.h
     shared/TaskRenameCharacter.cpp
@@ -157,6 +157,8 @@ target_link_libraries(LoginServer
     LoginAPI
     MonAPI2
     webAPI
+    ${OPENSSL_CRYPTO_LIBRARY}
+    ${OPENSSL_LIBRARIES}
     ${CURL_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )
diff --git a/engine/server/application/PlanetServer/src/CMakeLists.txt b/engine/server/application/PlanetServer/src/CMakeLists.txt
index 615d618e..ddc9fabc 100644
--- a/engine/server/application/PlanetServer/src/CMakeLists.txt
+++ b/engine/server/application/PlanetServer/src/CMakeLists.txt
@@ -106,7 +106,9 @@ target_link_libraries(PlanetServer
     localizationArchive
     unicode
     unicodeArchive
-	webAPI
-	${CURL_LIBRARIES}
+    webAPI
+    ${OPENSSL_CRYPTO_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${CURL_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )
diff --git a/external/3rd/library/webAPI/CMakeLists.txt b/external/3rd/library/webAPI/CMakeLists.txt
index 72465c75..0aa15c87 100644
--- a/external/3rd/library/webAPI/CMakeLists.txt
+++ b/external/3rd/library/webAPI/CMakeLists.txt
@@ -8,7 +8,6 @@ add_library(webAPI
 	json.hpp
 	webAPIHeartbeat.h
 	webAPIHeartbeat.cpp
-	${OPENSSL_INCLUDE_DIR}
 )
 
 include_directories(
diff --git a/external/3rd/library/webAPI/webAPI.cpp b/external/3rd/library/webAPI/webAPI.cpp
index da2b0df0..66929c67 100644
--- a/external/3rd/library/webAPI/webAPI.cpp
+++ b/external/3rd/library/webAPI/webAPI.cpp
@@ -17,6 +17,9 @@
 
 #include "webAPI.h"
 
+#include <openssl/ssl.h>
+#include <openssl/bio.h>
+
 using namespace StellaBellum;
 
 webAPI::webAPI(std::string endpoint, std::string userAgent) : uri(endpoint), userAgent(userAgent), statusCode(0) {}
diff --git a/external/3rd/library/webAPI/webAPI.h b/external/3rd/library/webAPI/webAPI.h
index d03b7dbf..acec945d 100644
--- a/external/3rd/library/webAPI/webAPI.h
+++ b/external/3rd/library/webAPI/webAPI.h
@@ -26,6 +26,7 @@
 
 #include <unordered_map>
 #include <openssl/ssl.h>
+#include <openssl/bio.h>
 #include <curl/curl.h>
 
 #endif
diff --git a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
index af451078..effbb220 100644
--- a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
+++ b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
@@ -192,6 +192,7 @@ include_directories(
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include
     ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicodeArchive/include/public
+    ${SWG_EXTERNALS_SOURCE_DIR}/3rd/library/webAPI
 )
 
 set(MAKE_SCHEMA_H ${SWG_ENGINE_SOURCE_DIR}/server/library/codegen/make_schema_h.pl)
@@ -342,5 +343,9 @@ target_link_libraries(SwgDatabaseServer
     localizationArchive
     unicode
     unicodeArchive
+    webAPI
+    ${OPENSSL_CRYPTO_LIBRARY}
+    ${OPENSSL_LIBRARIES}
+    ${CURL_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )
diff --git a/game/server/application/SwgDatabaseServer/src/linux/main.cpp b/game/server/application/SwgDatabaseServer/src/linux/main.cpp
index 71cc11b2..a08ab7b6 100755
--- a/game/server/application/SwgDatabaseServer/src/linux/main.cpp
+++ b/game/server/application/SwgDatabaseServer/src/linux/main.cpp
@@ -19,6 +19,10 @@
 #include "swgSharedNetworkMessages/SetupSwgSharedNetworkMessages.h"
 #include "swgServerNetworkMessages/SetupSwgServerNetworkMessages.h"
 
+#ifndef STELLA_INTERNAL
+#include "webAPIHeartbeat.h"
+#endif
+
 // ======================================================================
 
 void dumpPid(const char * argv)
@@ -34,6 +38,10 @@ int main(int argc, char ** argv)
 {
 //	dumpPid(argv[0]);
 
+#ifndef STELLA_INTERNAL
+        StellaBellum::webAPIHeartbeat();
+#endif
+
 	SetupSharedThread::install();
 	SetupSharedDebug::install(1024);
 
diff --git a/game/server/application/SwgGameServer/src/CMakeLists.txt b/game/server/application/SwgGameServer/src/CMakeLists.txt
index 77d3885d..9e525fb6 100644
--- a/game/server/application/SwgGameServer/src/CMakeLists.txt
+++ b/game/server/application/SwgGameServer/src/CMakeLists.txt
@@ -154,6 +154,8 @@ target_link_libraries(SwgGameServer
     unicodeArchive
     Base
     webAPI
+    ${OPENSSL_CRYPTO_LIBRARY}
+    ${OPENSSL_LIBRARIES}
     ${CURL_LIBRARIES}
     ${CMAKE_DL_LIBS}
 )