diff --git a/.github/workflows/singularity-integration.yml b/.github/workflows/singularity-integration.yml
index 9e2ae0fd1..5a7295eda 100644
--- a/.github/workflows/singularity-integration.yml
+++ b/.github/workflows/singularity-integration.yml
@@ -16,7 +16,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     container:
-      image: quay.io/singularity/singularity:v3.9.0
+      image: quay.io/singularity/singularity:v4.3.1
       options: "--privileged --workdir /data"
     steps:
       - uses: actions/checkout@v4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd70ff5e9..8856b2f5c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -805,9 +805,9 @@ install_inside_build()
 #---Populate the configure arguments returned by 'bdm-config --config'
 get_cmake_property(variables CACHE_VARIABLES)
 foreach(var ${variables})
-  if((var MATCHES "_(LIBRARIES|LIBRARY|INCLUDE|VERSION)") AND
-     (NOT ${${var}} STREQUAL "") AND
-     (NOT ${var} MATCHES "NOTFOUND"))
+  if(("${var}" MATCHES "_(LIBRARIES|LIBRARY|INCLUDE|VERSION)") AND
+     (NOT "${${var}}" STREQUAL "") AND
+     (NOT "${${var}}" MATCHES "NOTFOUND"))
     if (var MATCHES "^QT_")
       # filter out the very long list of Qt libraries and include dirs
       if (var MATCHES "(QT_LIBRARY_DIR|QT_QTCORE_INCLUDE_DIR)")