diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7f296819..40338b8b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1927,7 +1927,7 @@ if (BUILD_OPENSSL)
 	# Static linking of SSL makes compilation on Linux a pain.
 	# Let's do it for Windows and Apple only
 
-	if (NOT LINUX)
+	if (HEADLESS OR NOT LINUX)
 		set(OPENSSL_USE_STATIC_LIBS TRUE)
 	endif()
 
diff --git a/cmake/linux_actions/install_openssl3.sh b/cmake/linux_actions/install_openssl3.sh
index fb0906cc5..afe56ddc3 100755
--- a/cmake/linux_actions/install_openssl3.sh
+++ b/cmake/linux_actions/install_openssl3.sh
@@ -23,16 +23,12 @@ cd "${OPENSSL_VERSION}/"
 
 echo "OpenSSL3: Calling ./config"
 # Configure OpenSSL
-sudo ./config
+sudo ./config no-shared
 
 echo "OpenSSL3: Calling make"
 # Build OpenSSL
 sudo make
 
-echo "OpenSSL3: Calling make test"
-# Run tests (optional, can be skipped with 'make -k test' if some tests fail)
-sudo make test
-
 echo "OpenSSL3: Calling make install"
 # Install OpenSSL
 sudo make install