diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e56dda815..4a85fab5df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ if(DEFINED NEO_EXTRA_DEFINES)
   endforeach()
 endif()
 
-include("${BRANCH_TYPE}.cmake" OPTIONAL)
+include("${BRANCH_TYPE}/${BRANCH_TYPE}.cmake" OPTIONAL)
 
 if(NOT CMAKE_BUILD_TYPE)
   message(STATUS "CMAKE_BUILD_TYPE not specified, using Release")
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index a4bcddbd95..f98219fb44 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -20,7 +20,7 @@ components:
   infra:
     branch: infra
     dest_dir: infra
-    revision: f442c2c03fb44d60a907400ebed401141430c3fb
+    revision: 1275883f58c35a546231ba24de6c600087d644cf
     type: git
   internal:
     branch: master