diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e02aa5b38cbf42bdd024b2093356a93b845dff16..d4da138a60d2bf7b49004677ea624472a151462e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -326,5 +326,5 @@ release_job:
             url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/libftl-protocol/${CI_COMMIT_TAG}/libftl-protocol-${CI_COMMIT_TAG}-win64.zip'
           - name: 'Win64 Debug Binary (ZIP)'
             url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/libftl-protocol/${CI_COMMIT_TAG}/libftl-protocol-${CI_COMMIT_TAG}-win64-debug.zip'
-          - name: 'ARM64 Binary (ZIP)'
-            url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/libftl-protocol/${CI_COMMIT_TAG}/libftl-protocol-${CI_COMMIT_TAG}-arm64.zip'
+#          - name: 'ARM64 Binary (ZIP)'
+#            url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/libftl-protocol/${CI_COMMIT_TAG}/libftl-protocol-${CI_COMMIT_TAG}-arm64.zip'
diff --git a/cmake/BeyondProtocolConfig.cmake.in b/cmake/BeyondProtocolConfig.cmake.in
index 0365c8070b0d7577bd407f63e7d369d36b33c98f..3ef5fe52a9a2b0eb571df914b1891f39b75af596 100644
--- a/cmake/BeyondProtocolConfig.cmake.in
+++ b/cmake/BeyondProtocolConfig.cmake.in
@@ -8,4 +8,19 @@ find_dependency(MsQuic)
 
 include("${CMAKE_CURRENT_LIST_DIR}/BeyondProtocolTargets.cmake")
 
+if (@WITH_OPENSSL@)
+	set(OPENSSL_USE_STATIC_LIBS TRUE)
+	if(WIN32)
+		# On Windows also checks if OpenSSL binaries are available with MsQuic 
+		if(NOT DEFINED OPENSSL_ROOT_DIR)
+			set(OPENSSL_ROOT_DIR "${MsQuic_DIR}/../..")
+			find_package(OpenSSL)
+		endif()
+	endif()
+	if (NOT OPENSSL_FOUND)
+		find_package(OpenSSL REQUIRED)
+	endif()
+	set(HAVE_OPENSSL TRUE)
+endif()
+
 check_required_components(BeyondProtocol)