diff --git a/CHANGELOG.md b/CHANGELOG.md
index c36f9d814..7908887b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - #1348 Capturing error messages due to exceptions properly
 - #1350 Fixed bug where there are no projects in a bindable table scan
 - #1359 Avoid cuda issues when free pinned memory
+- #1365 Fixed build after sublibs changes on cudf
 
 # BlazingSQL 0.18.0 (Date TBS)
 
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
index f177a8723..84c58a1e1 100644
--- a/engine/CMakeLists.txt
+++ b/engine/CMakeLists.txt
@@ -324,24 +324,7 @@ target_link_libraries(blazingsql-engine
     #Threads::Threads
     pthread
 
-    # TODO: Make this cleaner. Here we just used to link cudf, but cudf got split into a whole bunch of libraries in this PR https://github.com/rapidsai/cudf/pull/6134
-    # cudf
-    libcudf_ast.so    
-    libcudf_interop.so 
-    libcudf_partitioning.so  
-    libcudf_rolling.so
-    libcudf_base.so
-    libcudf_io.so
-    libcudf_reductions.so
-    libcudf.so
-    libcudf_comms.so
-    libcudf_join.so
-    libcudf_replace.so
-    libcudf_hash.so
-    libcudf_merge.so
-    libcudf_reshape.so
-    libcudf_transpose.so 
-    
+    cudf
     zmq
     cudart
 
diff --git a/engine/src/execution_graph/logic_controllers/LogicalProject.cpp b/engine/src/execution_graph/logic_controllers/LogicalProject.cpp
index c07f98b63..b3dd460c0 100644
--- a/engine/src/execution_graph/logic_controllers/LogicalProject.cpp
+++ b/engine/src/execution_graph/logic_controllers/LogicalProject.cpp
@@ -5,6 +5,7 @@
 #include <cudf/strings/contains.hpp>
 #include <cudf/strings/replace_re.hpp>
 #include <cudf/strings/replace.hpp>
+#include <cudf/strings/detail/replace.hpp>
 #include <cudf/strings/substring.hpp>
 #include <cudf/strings/case.hpp>
 #include <cudf/strings/strip.hpp>
@@ -142,7 +143,7 @@ std::unique_ptr<cudf::column> evaluate_string_functions(const cudf::table_view &
         std::string target = StringUtil::removeEncapsulation(arg_tokens[1], encapsulation_character);
         std::string repl = StringUtil::removeEncapsulation(arg_tokens[2], encapsulation_character);
 
-        computed_col = cudf::strings::replace(column, target, repl);
+        computed_col = cudf::strings::detail::replace<cudf::strings::detail::replace_algorithm::ROW_PARALLEL>(column, target, repl);
         break;
     }
     case operator_type::BLZ_STR_REGEXP_REPLACE:
diff --git a/engine/tests/CMakeLists.txt b/engine/tests/CMakeLists.txt
index 38b6a53ae..196c59222 100644
--- a/engine/tests/CMakeLists.txt
+++ b/engine/tests/CMakeLists.txt
@@ -30,24 +30,7 @@ function(configure_test TEST_NAME Tests_SRCS)
         blazingdb-io
         Threads::Threads
 
-        # TODO: Make this cleaner. Here we just used to link cudf, but cudf got split into a whole bunch of libraries in this PR https://github.com/rapidsai/cudf/pull/6134
-        # cudf
-        libcudf_base.so
-        libcudf_rolling.so
-        libcudf_replace.so
-        libcudf_transpose.so
-        libcudf_reductions.so
-        libcudf_ast.so
-        libcudf_join.so
-        libcudf_reshape.so
-        libcudf_merge.so
-        libcudf_comms.so
-        libcudf_hash.so
-        libcudf_io.so
-        libcudf_interop.so
-        libcudf_partitioning.so
-
-
+        cudf
         zmq
         cudart