diff --git a/Applications/DataExplorer/DataExplorer.cmake b/Applications/DataExplorer/DataExplorer.cmake
index 6deacb5c95840d88b02d2497c01e82b5344c7f11..0a0d4791a4be10a9bddacba1457a6ccdf7e4c3e2 100644
--- a/Applications/DataExplorer/DataExplorer.cmake
+++ b/Applications/DataExplorer/DataExplorer.cmake
@@ -53,10 +53,8 @@ target_link_libraries(DataExplorer
     ${VTK_LIBRARIES}
 )
 
-if(NOT APPLE AND OGS_USE_CONAN)
-    if(UNIX)
-        target_link_libraries(DataExplorer Qt5::X11Extras)
-    endif()
+if(UNIX AND NOT APPLE)
+    target_link_libraries(DataExplorer Qt5::X11Extras)
 endif()
 
 # Workaround for Windows conan tiff-package
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index e279a61e91ab1c148f8373233945968229d12f23..6fc82f9e2954fc1a676e69425af8d78cb1cc1239 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit e279a61e91ab1c148f8373233945968229d12f23
+Subproject commit 6fc82f9e2954fc1a676e69425af8d78cb1cc1239
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 0060c5f1f61788e66c80814d1bc693e67bc310f3..f49ae38334445d8cc3e489390887255a216ba541 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -118,8 +118,8 @@ endif()
 ## Qt5 library ##
 if(OGS_BUILD_GUI)
     set(QT_MODULES Gui Widgets Xml XmlPatterns)
-    if(OGS_USE_CONAN AND UNIX AND NOT APPLE)
-        set(QT_MODULES ${QT_MODULES} X11Extras)
+    if(UNIX AND NOT APPLE)
+        list(APPEND QT_MODULES X11Extras)
     endif()
     find_package(Qt5 ${ogs.minimum_version.qt} REQUIRED ${QT_MODULES})
     cmake_policy(SET CMP0020 NEW)