diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6e6bd2928d..fb2eeb4049 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,6 +37,6 @@ Every new feature or fix should embed its unit test(s).
 
 ## More...
 
-More about [sources and contrib](http://doc.tock.ai/tock/en/about/contribute/).
+More about [sources and contrib](https://doc.tock.ai/tock/master/about/contribute.html).
 
-Feel free to [contact us](https://doc.tock.ai/tock/en/about/contact/).
\ No newline at end of file
+Feel free to [contact us](https://doc.tock.ai/tock/master/about/contact.html).
\ No newline at end of file
diff --git a/README.md b/README.md
index 466d7631b8..746669fa8c 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 # Tock - The Open Conversation Kit
 
-<img alt="Tock Logo" src="http://doc.tock.ai/tock/en/assets/images/logo.svg" style="width: 150px;"><br>
+<img alt="Tock Logo" src="http://doc.tock.ai/tock/master/img/logo.svg" style="width: 150px;"><br>
 
 _Curious about what Tock is or, who is using it? Check out our [website](https://doc.tock.ai)!_
 
@@ -27,7 +27,7 @@ Open Conversational AI platform to build Bots:
  
 🏠 Home: [https://doc.tock.ai](https://doc.tock.ai)
  
-🕮 Documentation: [https://doc.tock.ai/tock](https://doc.tock.ai/tock/index.html)
+🕮 Documentation: [https://doc.tock.ai/tock/master/](https://doc.tock.ai/tock/master/)
 
 🐋 Docker configurations: [https://github.com/theopenconversationkit/tock-docker](https://github.com/theopenconversationkit/tock-docker)
 
diff --git a/bot/connector-messenger/README.md b/bot/connector-messenger/README.md
index 197de16faa..6074d4a15e 100644
--- a/bot/connector-messenger/README.md
+++ b/bot/connector-messenger/README.md
@@ -11,7 +11,7 @@
 * Then go to the Configuration -> Bot Configurations menu in the Tock Bot administration interface,
  and create a new configuration with these parameters. 
 
-For a more detailed guide, refer to https://doc.tock.ai/tock/en/guide/messenger/
+For a more detailed guide, refer to https://doc.tock.ai/tock/master/guides/messenger.html
  
 ## Bot API 
  
diff --git a/bot/connector-web/Swagger_TOCKWebConnector.yaml b/bot/connector-web/Swagger_TOCKWebConnector.yaml
index 6ffc1f0d10..883026cf62 100644
--- a/bot/connector-web/Swagger_TOCKWebConnector.yaml
+++ b/bot/connector-web/Swagger_TOCKWebConnector.yaml
@@ -60,7 +60,7 @@ paths:
                       title: 'The Open Conversation Kit'
                       subTitle: 'Open platform for Conversational AI.'
                       file:
-                        url: 'https://doc.tock.ai/tock/fr/assets/images/logo.svg'
+                        url: 'https://doc.tock.ai/tock/master/fr/assets/images/logo.svg'
                         name: 'logo.svg'
                         type: image
                       buttons:
diff --git a/docs/docs/en/about/community.md b/docs/docs/en/about/community.md
index 162d20ebd8..9b50e6e301 100644
--- a/docs/docs/en/about/community.md
+++ b/docs/docs/en/about/community.md
@@ -32,9 +32,9 @@ To find Tock news, new projects, conferences, releases and more please visit the
 
 Specific news can be found on these topics:
 
-* [Known users & projects](http://doc.tock.ai/tock/en/about/showcase/)
-* [Presentations & conferences](http://doc.tock.ai/tock/en/about/resources/)
-* [Awards](http://doc.tock.ai/tock/en/about/awards/)
+* [Known users & projects](https://doc.tock.ai/tock/master/about/showcase.html)
+* [Presentations & conferences](https://doc.tock.ai/tock/master/about/ressources.html)
+* [Awards](https://doc.tock.ai/tock/master/about/awards.html)
 
 For releases & features:
 
@@ -84,7 +84,7 @@ Thanks to [e.Voyageurs SNCF](https://www.sncf.com/fr/groupe/newsroom/e-voyageurs
 public Live Demo platform.
 
 * [Live Demo](https://demo.tock.ai/) 
-* [Guide _Create your 1st bot with Tock_](https://doc.tock.ai/tock/en/guides/studio.md/)
+* [Guide _Create your 1st bot with Tock_](https://doc.tock.ai/tock/master/guides/studio.html)
 
 ## Help
 
diff --git a/docs/docs/en/dev/bot-api.md b/docs/docs/en/dev/bot-api.md
index a8aa2fbd51..69d55d5892 100644
--- a/docs/docs/en/dev/bot-api.md
+++ b/docs/docs/en/dev/bot-api.md
@@ -49,14 +49,14 @@ For example in a [Maven](https://maven.apache.org/) project:
         <dependency>
             <groupId>ai.tock</groupId>
             <artifactId>tock-bot-api-websocket</artifactId>
-            <version>24.9.6</version>
+            <version>24.9.7</version>
         </dependency>
 ```
 
 Or in a [Gradle](https://gradle.org/) project:
 
 ```groovy
-compile 'ai.tock:tock-bot-api-websocket:24.9.6'
+compile 'ai.tock:tock-bot-api-websocket:24.9.7'
 ```
 
 ### Enable WebHook mode
@@ -69,14 +69,14 @@ For example in a [Maven](https://maven.apache.org/) project:
         <dependency>
             <groupId>ai.tock</groupId>
             <artifactId>tock-bot-api-webhook</artifactId>
-            <version>24.9.6</version>
+            <version>24.9.7</version>
         </dependency>
 ```
 
 Or in a [Gradle](https://gradle.org/) project:
 
 ```groovy
-compile 'ai.tock:tock-bot-api-webhook:24.9.6'
+compile 'ai.tock:tock-bot-api-webhook:24.9.7'
 ```
 
 In this case, unlike in _WebSocket_ mode, the application/bot started must be reachable by the
@@ -175,4 +175,4 @@ The guide [Deploying Tock with Docker](../guides/platform.md) or the chapter
 [Installation](../admin/installation.md) show how to deploy this module if necessary.
 
 The only modification required compared to the example code for the demonstration platform is to replace
-the `startWithDemo` method with `start`, specifying if necessary the address of the `bot-api` server.
\ No newline at end of file
+the `startWithDemo` method with `start`, specifying if necessary the address of the `bot-api` server.
diff --git a/docs/docs/en/dev/bot-integre.md b/docs/docs/en/dev/bot-integre.md
index 0956672a12..fea40624d4 100644
--- a/docs/docs/en/dev/bot-integre.md
+++ b/docs/docs/en/dev/bot-integre.md
@@ -43,14 +43,14 @@ For example in a [Maven](https://maven.apache.org/) project:
         <dependency>
             <groupId>ai.tock</groupId>
             <artifactId>bot-toolkit</artifactId>
-            <version>24.9.6</version>
+            <version>24.9.7</version>
         </dependency>
 ```
 
 Or in a [Gradle](https://gradle.org/) project:
 
 ```groovy
-      compile 'ai.tock:bot-toolkit:24.9.6'
+      compile 'ai.tock:bot-toolkit:24.9.7'
 ```
 
 ### A bot is a set of stories
@@ -505,4 +505,4 @@ To retrieve the parameters of the button that was clicked:
 ```
 ### Unit Tests
 
-The [Unit Tests](test.md) page presents the framework provided to perform TUs with Tock.
\ No newline at end of file
+The [Unit Tests](test.md) page presents the framework provided to perform TUs with Tock.
diff --git a/docs/docs/en/dev/test.md b/docs/docs/en/dev/test.md
index 0c13089c2e..c0ed5f2277 100644
--- a/docs/docs/en/dev/test.md
+++ b/docs/docs/en/dev/test.md
@@ -14,7 +14,7 @@ With Maven:
         <dependency>
             <groupId>ai.tock</groupId>
             <artifactId>bot-test</artifactId>
-            <version>24.9.6</version>
+            <version>24.9.7</version>
             <scope>test</scope>
         </dependency>
 ```
@@ -22,7 +22,7 @@ With Maven:
 Or gradle :
 
 ```groovy
-      testCompile 'ai.tock:bot-test:24.9.6'
+      testCompile 'ai.tock:bot-test:24.9.7'
 ``` 
 
 This entire framework is documented in KDoc format [here](https://doc.tock.ai/tock/dokka/tock/ai.tock.bot.test).
diff --git a/docs/docs/fr/about/community.md b/docs/docs/fr/about/community.md
index b4018f3330..c7279cdccb 100644
--- a/docs/docs/fr/about/community.md
+++ b/docs/docs/fr/about/community.md
@@ -32,9 +32,9 @@ Pour suivre l'actualité des projets Tock mais aussi les meetups, conférences,
 
 Vous pouvez également retrouver les nouveautés dans ces pages plus spécfiques :
 
-* [Projets & utilisateurs connus](https://doc.tock.ai/tock/fr/about/showcase/)
-* [Présentations & conférences](https://doc.tock.ai/tock/fr/about/ressources/)
-* [Prix & récompenses](https://doc.tock.ai/tock/fr/about/recompenses/)
+* [Projets & utilisateurs connus](https://doc.tock.ai/tock/master/fr/about/showcase.html)
+* [Présentations & conférences](https://doc.tock.ai/tock/master/fr/about/ressources.html)
+* [Prix & récompenses](https://doc.tock.ai/tock/master/fr/about/awards.html)
 
 Enfin, pour suivre les versions et fonctionnalités de Tock :
 
@@ -87,7 +87,7 @@ la solution. Elle est accompagnée d'un guide pour faire ses premiers pas. Merci
 plateforme de démo en ligne.
 
 * [Plateforme Démo en ligne](https://demo.tock.ai/) 
-* [Guide _Créer son 1er bot avec Tock_](http://doc.tock.ai/tock/fr/guides/studio.md/)
+* [Guide _Créer son 1er bot avec Tock_](https://doc.tock.ai/tock/master/fr/guides/studio.html)
 
 ## Aide
 
diff --git a/docs/docs/fr/dev/bot-api.md b/docs/docs/fr/dev/bot-api.md
index 0484f43a55..72b95bf8f4 100644
--- a/docs/docs/fr/dev/bot-api.md
+++ b/docs/docs/fr/dev/bot-api.md
@@ -54,14 +54,14 @@ Par exemple dans un projet [Maven](https://maven.apache.org/) :
         <dependency>
             <groupId>ai.tock</groupId>
             <artifactId>tock-bot-api-websocket</artifactId>
-            <version>24.9.6</version>
+            <version>24.9.7</version>
         </dependency>
 ```
 
 Ou dans un projet [Gradle](https://gradle.org/) :
 
 ```groovy
-      compile 'ai.tock:tock-bot-api-websocket:24.9.6'
+      compile 'ai.tock:tock-bot-api-websocket:24.9.7'
 ```
 
 ### Activer le mode WebHook
@@ -74,14 +74,14 @@ Par exemple dans un projet [Maven](https://maven.apache.org/) :
         <dependency>
             <groupId>ai.tock</groupId>
             <artifactId>tock-bot-api-webhook</artifactId>
-            <version>24.9.6</version>
+            <version>24.9.7</version>
         </dependency>
 ```
 
 Ou dans un projet [Gradle](https://gradle.org/) :
 
 ```groovy
-      compile 'ai.tock:tock-bot-api-webhook:24.9.6'
+      compile 'ai.tock:tock-bot-api-webhook:24.9.7'
 ```
 
 Dans ce cas, contrairement au mode _WebSocket_, il faut que l'application/bot démarrée soit joignable par la 
diff --git a/docs/docs/fr/dev/bot-integre.md b/docs/docs/fr/dev/bot-integre.md
index 2696e84eaf..ba20f0fa31 100644
--- a/docs/docs/fr/dev/bot-integre.md
+++ b/docs/docs/fr/dev/bot-integre.md
@@ -43,14 +43,14 @@ Par exemple dans un projet [Maven](https://maven.apache.org/) :
         <dependency>
             <groupId>ai.tock</groupId>
             <artifactId>bot-toolkit</artifactId>
-            <version>24.9.6</version>
+            <version>24.9.7</version>
         </dependency>
 ```
 
 Ou dans un projet [Gradle](https://gradle.org/) :
 
 ```groovy
-      compile 'ai.tock:bot-toolkit:24.9.6'
+      compile 'ai.tock:bot-toolkit:24.9.7'
 ```
 
 ### Un bot est un ensemble de parcours (stories)
diff --git a/docs/docs/fr/dev/test.md b/docs/docs/fr/dev/test.md
index 8bd8f8c02d..8921539e9e 100644
--- a/docs/docs/fr/dev/test.md
+++ b/docs/docs/fr/dev/test.md
@@ -14,7 +14,7 @@ Avec Maven :
         <dependency>
             <groupId>ai.tock</groupId>
             <artifactId>bot-test</artifactId>
-            <version>24.9.6</version>
+            <version>24.9.7</version>
             <scope>test</scope>
         </dependency>
 ```
@@ -22,7 +22,7 @@ Avec Maven :
 ou Gradle :
 
 ```groovy
-      testCompile 'ai.tock:bot-test:24.9.6'
+      testCompile 'ai.tock:bot-test:24.9.7'
 ``` 
 
 L'ensemble de ce framework est documenté au format KDoc [ici](https://doc.tock.ai/tock/dokka/tock/ai.tock.bot.test).
diff --git a/docs/docs/fr/guides/api.md b/docs/docs/fr/guides/api.md
index f240f45a02..ceeb0b1aa6 100644
--- a/docs/docs/fr/guides/api.md
+++ b/docs/docs/fr/guides/api.md
@@ -77,7 +77,7 @@ la dépendance `tock-bot-api-websocket` incluse :
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <plugin.kotlin.version>1.3.41</plugin.kotlin.version>
         <plugin.source.version>3.1.0</plugin.source.version>
-        <lib.tock.version>24.9.6</lib.tock.version>
+        <lib.tock.version>24.9.7</lib.tock.version>
     </properties>
 
     <dependencies>