diff --git a/compiler/Makefile b/compiler/Makefile
index bcc1ceeee..e366128d1 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -6,7 +6,7 @@ CC_COMPILER=
 CXX_COMPILER=
 
 CONCRETE_OPTIMIZER_DIR ?= $(shell pwd)/.dependencies/concrete-optimizer
-CONCRETE_OPTIMIZER_BRANCH ?= compat
+CONCRETE_OPTIMIZER_BRANCH ?= master
 
 KEYSETCACHEDEV=/tmp/KeySetCache
 KEYSETCACHECI ?= ../KeySetCache
diff --git a/compiler/lib/Support/V0Parameters.cpp b/compiler/lib/Support/V0Parameters.cpp
index 80efae91b..3ad14bb9d 100644
--- a/compiler/lib/Support/V0Parameters.cpp
+++ b/compiler/lib/Support/V0Parameters.cpp
@@ -23,7 +23,7 @@ namespace concretelang {
 
 static void display(V0FHEConstraint constraint,
                     optimizer::Config optimizerConfig,
-                    concrete_optimizer::Solution sol,
+                    concrete_optimizer::v0::Solution sol,
                     std::chrono::milliseconds duration) {
   if (!optimizerConfig.display) {
     return;
@@ -65,8 +65,8 @@ llvm::Optional<V0Parameter> getV0Parameter(V0FHEConstraint constraint,
   // https://github.com/zama-ai/concrete-optimizer/blob/prototype/python/optimizer/V0Parameters/tabulation.py#L58
   double p_error = optimizerConfig.p_error;
   auto start = chrono::high_resolution_clock::now();
-  auto sol = concrete_optimizer::optimise_bootstrap(constraint.p, security,
-                                                    noise_factor, p_error);
+  auto sol = concrete_optimizer::v0::optimize_bootstrap(constraint.p, security,
+                                                        noise_factor, p_error);
   auto stop = chrono::high_resolution_clock::now();
   if (sol.p_error == 1.0) {
     // The optimizer return a p_error = 1 if there is no solution