diff --git a/Makefile b/Makefile
index a4be30619c7..0a133ccb816 100644
--- a/Makefile
+++ b/Makefile
@@ -21,14 +21,14 @@ define dune_boot_context
 (context (default
   (name default)
   ; CR sdolan: profile dev might be faster, but the compiler currently fails to build in dev.
-  (profile release)))
+  (profile boot)))
 endef
 
 define dune_runtime_stdlib_context
 (lang dune 2.8)
 (context (default
   (name runtime_stdlib)
-  (profile release)
+  (profile main)
   (paths
     (PATH ("$(CURDIR)/_build/_bootinstall/bin" :standard))
     (OCAMLLIB ("$(CURDIR)/_build/_bootinstall/lib/ocaml")))
@@ -40,7 +40,7 @@ define dune_main_context
 (lang dune 2.8)
 (context (default
   (name main)
-  (profile release)
+  (profile main)
   (paths
     (PATH ("$(CURDIR)/_build/_bootinstall/bin" :standard))
     (OCAMLLIB ("$(CURDIR)/_build/install/runtime_stdlib/lib/ocaml_runtime_stdlib")))
diff --git a/dune b/dune
index 715e5c0cf90..5d2b8851d97 100755
--- a/dune
+++ b/dune
@@ -11,7 +11,10 @@
 ; set warning as error in release profile
 
 (env
- (release
+ (main
+  (flags
+   (:standard -warn-error +A)))
+ (boot
   (flags
    (:standard -warn-error +A))))