diff --git a/README.md b/README.md
index 0296fc03..1d570212 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ or in parallel, forming a single-use coordination network.
 Aqua's runtime is heterogeneous: it includes browsers, servers, devices, all involved in solving a single task.
 Therefore, Aqua scripts are compiled into several targets at once, with AIR and Typescript as a default.
 
-Please refer to [Aqua Book](https://doc.fluence.dev/aqua-book/) to learn more about Aqua language.
+Please refer to [Aqua Book](https://fluence.dev/docs/aqua-book/introduction) to learn more about Aqua language.
 
 ## Install and run
 
@@ -69,8 +69,8 @@ java -jar aqua-%version_number%.jar -i path/to/input/dir -o path/to/output/dir
 
 ## References
 
-- [Aqua Book](https://doc.fluence.dev/aqua-book/)
-- [Aqua Changelog](https://doc.fluence.dev/aqua-book/changelog)
+- [Aqua Book](https://fluence.dev/docs/aqua-book/introduction)
+- [Aqua Changelog](https://fluence.dev/docs/aqua-book/changelog)
 - [Fluence docs](https://fluence.dev/)
 - [Examples & tutorials](https://github.com/fluencelabs/examples)
 - [Aqua Playground](https://github.com/fluencelabs/aqua-playground)
\ No newline at end of file
diff --git a/aqua-src/builtin.aqua b/aqua-src/builtin.aqua
index 07f3478d..09a407a0 100644
--- a/aqua-src/builtin.aqua
+++ b/aqua-src/builtin.aqua
@@ -73,11 +73,11 @@ service Op("op"):
     array_length(array: []string) -> u32
 
     -- takes any number of arguments and wraps them into a single array
-    -- see the doc on varargs https://doc.fluence.dev/aqua-book/libraries/aqua-lib#functions-with-a-variable-number-of-arguments
+    -- see the doc on varargs https://fluence.dev/docs/aqua-book/libraries/aqua-lib#functions-with-a-variable-number-of-arguments
     array(a: string, b: string, c: string, d: string) -> []string
 
     -- takes any number of arrays and flattens them by concatenating
-    -- see the doc on varargs https://doc.fluence.dev/aqua-book/libraries/aqua-lib#functions-with-a-variable-number-of-arguments
+    -- see the doc on varargs https://fluence.dev/docs/aqua-book/libraries/aqua-lib#functions-with-a-variable-number-of-arguments
     concat(a: []string, b: []string, c: []string, d: []string) -> []string
 
     -- takes a single argument and returns it back
diff --git a/cli/.js/src/main/scala/aqua/FuncCompiler.scala b/cli/.js/src/main/scala/aqua/FuncCompiler.scala
index 27a3b704..f2264999 100644
--- a/cli/.js/src/main/scala/aqua/FuncCompiler.scala
+++ b/cli/.js/src/main/scala/aqua/FuncCompiler.scala
@@ -52,7 +52,7 @@ class FuncCompiler[F[_]: Files: AquaIO: Async](
       .map(validNec)
       .getOrElse(
         Validated.invalidNec[String, FuncArrow](
-          s"There is no function '${func.ability.map(_ + ".").getOrElse("")}${func.name}' or it is not exported. Check the spelling or see https://doc.fluence.dev/aqua-book/language/header#export"
+          s"There is no function '${func.ability.map(_ + ".").getOrElse("")}${func.name}' or it is not exported. Check the spelling or see https://fluence.dev/docs/aqua-book/language/header/#export"
         )
       )
       .andThen { func =>
@@ -73,7 +73,7 @@ class FuncCompiler[F[_]: Files: AquaIO: Async](
           .map(validNec)
           .getOrElse(
             Validated.invalidNec[String, ServiceModel](
-              s"There is no service '${js.name}' (described in json-service file) in aqua source or it is not exported. Check the spelling or see https://doc.fluence.dev/aqua-book/language/header#export"
+              s"There is no service '${js.name}' (described in json-service file) in aqua source or it is not exported. Check the spelling or see https://fluence.dev/docs/aqua-book/language/header/#export"
             )
           )
       )