diff --git a/.gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml b/.gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml
index 96793db1cecd482df8d67e5f376689e057fb715c..167fef30c9d89502cb5288562a3ff60720c345e5 100644
--- a/.gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml
+++ b/.gitlab-ci.d/auxiliary-jobs.gitlab-ci.yml
@@ -113,7 +113,7 @@ documentation:
 website_trigger:
   stage: build_website_content
   variables:
-    OCTOPUS_COMMIT_REF: $CI_COMMIT_REF_NAME
+    OCTOPUS_COMMIT_REF: $CI_COMMIT_SHA
   trigger:
     project: octopus-code/octopus-documentation
     strategy: depend
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 50f238d946d533b77997f81794a851045b93d1e0..08ef2a079471e3f114eb194ae49fe5cc9d013ba0 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -27,10 +27,12 @@ if (TARGET ELPA::OpenMP)
 elseif (TARGET ELPA::elpa)
 	target_link_libraries(Octopus_octopus PRIVATE ELPA::elpa)
 endif ()
-if (TARGET MKL::${MKL_SCALAPACK})
-	target_link_libraries(Octopus_octopus PRIVATE MKL::${MKL_SCALAPACK})
-elseif (TARGET SCALAPACK::scalapack)
-	target_link_libraries(Octopus_octopus PRIVATE SCALAPACK::scalapack)
+if (OCTOPUS_ScaLAPACK)
+	if (TARGET MKL::${MKL_SCALAPACK})
+		target_link_libraries(Octopus_octopus PRIVATE MKL::${MKL_SCALAPACK})
+	elseif (TARGET SCALAPACK::scalapack)
+		target_link_libraries(Octopus_octopus PRIVATE SCALAPACK::scalapack)
+	endif ()
 endif ()
 if (TARGET MPI::MPI_Fortran)
 	target_link_libraries(Octopus_octopus PUBLIC MPI::MPI_Fortran)
diff --git a/src/math/CMakeLists.txt b/src/math/CMakeLists.txt
index 674a072d19d412ab7de10d875bc82c081d9b2d19..dbdaf1eb689fc36faceba2e739d9a4d79fade7a7 100644
--- a/src/math/CMakeLists.txt
+++ b/src/math/CMakeLists.txt
@@ -54,12 +54,12 @@ if (TARGET MKL::MKL)
 	target_link_libraries(Octopus_lib PRIVATE MKL::MKL)
 	# FFTW interface for mkl is not automatically set
 	target_include_directories(Octopus_lib PRIVATE ${MKL_ROOT}/include/fftw)
-	if (TARGET MKL::${MKL_SCALAPACK})
-		target_link_libraries(Octopus_lib PRIVATE MKL::${MKL_SCALAPACK})
-	endif ()
 	if (OCTOPUS_ScaLAPACK AND NOT TARGET MKL::${MKL_SCALAPACK})
 		message(FATAL_ERROR "Missing MKL ScaLAPACK target")
 	endif ()
+	if (OCTOPUS_ScaLAPACK)
+		target_link_libraries(Octopus_lib PRIVATE MKL::${MKL_SCALAPACK})
+	endif ()
 else ()
 	target_link_libraries(Octopus_lib PRIVATE BLAS::BLAS)
 	target_link_libraries(Octopus_lib PRIVATE LAPACK::LAPACK)