diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40c1035b..a0face69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,7 +186,8 @@ set(ARTEMIS_SINGULARITY_INCLUDE_PATHS
     ${CMAKE_CURRENT_SOURCE_DIR}/external/singularity-eos/utils/variant/include
     ${CMAKE_CURRENT_SOURCE_DIR}/external/singularity-opac/utils
     ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_SOURCE_DIR})
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated>)
 
 # Set Jaybenne config options and paths
 # NOTE(@pdmullen): For the life of us, we are still not sure why we can't treat
diff --git a/external/singularity-eos b/external/singularity-eos
index f7df74f9..3f78b830 160000
--- a/external/singularity-eos
+++ b/external/singularity-eos
@@ -1 +1 @@
-Subproject commit f7df74f90d53e97d048cd230eec1d6203d7c37d2
+Subproject commit 3f78b8306701c8265eb54e4572a3d382a7a727e4