diff --git a/docs/best_practices/data_scientist_best_practices.md b/docs/best_practices/data_scientist_best_practices.md
index f092791c..2996d5ef 100644
--- a/docs/best_practices/data_scientist_best_practices.md
+++ b/docs/best_practices/data_scientist_best_practices.md
@@ -47,7 +47,7 @@ that you need.
   accessed, [compared](../webapp/webapp_exp_comparing.md) and [tracked](../webapp/webapp_exp_track_visual.md).
 - [ClearML Agent](../clearml_agent.md) does the heavy lifting. It reproduces the execution environment, clones your code, 
   applies code patches, manages parameters (including overriding them on the fly), executes the code, and queues multiple tasks.
-  It can even [build](../../clearml_agent/clearml_agent_docker_exec#exporting-a-task-into-a-standalone-docker-container) the docker container for you!  
+  It can even [build](../getting_started/clearml_agent_docker_exec.md#exporting-a-task-into-a-standalone-docker-container) the container for you!  
 - [ClearML Pipelines](../pipelines/pipelines.md) ensure that steps run in the same order, 
   programmatically chaining tasks together, while giving an overview of the execution pipeline's status.
 
diff --git a/docs/getting_started/clearml_agent_docker_exec.md b/docs/getting_started/clearml_agent_docker_exec.md
index c1c3eb30..6e15df1f 100644
--- a/docs/getting_started/clearml_agent_docker_exec.md
+++ b/docs/getting_started/clearml_agent_docker_exec.md
@@ -1,5 +1,5 @@
 ---
-title:   Building Executable Task Containers
+title: Building Executable Task Containers
 ---
 
 ## Exporting a Task into a Standalone Docker Container
diff --git a/docs/img/gif/dataset_dark.gif b/docs/img/gif/dataset_dark.gif
index 85486974..092b403b 100644
Binary files a/docs/img/gif/dataset_dark.gif and b/docs/img/gif/dataset_dark.gif differ
diff --git a/docs/img/gif/integrations_yolov5.gif b/docs/img/gif/integrations_yolov5.gif
index 0a0795bd..4c99ca63 100644
Binary files a/docs/img/gif/integrations_yolov5.gif and b/docs/img/gif/integrations_yolov5.gif differ
diff --git a/docs/img/webapp_compare_exp_select_2.png b/docs/img/webapp_compare_exp_select_2.png
index e1e561fd..46fd6aae 100644
Binary files a/docs/img/webapp_compare_exp_select_2.png and b/docs/img/webapp_compare_exp_select_2.png differ
diff --git a/docs/img/webapp_compare_exp_select_2_dark.png b/docs/img/webapp_compare_exp_select_2_dark.png
index d1a3b2e0..e03940fe 100644
Binary files a/docs/img/webapp_compare_exp_select_2_dark.png and b/docs/img/webapp_compare_exp_select_2_dark.png differ
diff --git a/docs/webapp/webapp_exp_track_visual.md b/docs/webapp/webapp_exp_track_visual.md
index 37687e57..a216e54a 100644
--- a/docs/webapp/webapp_exp_track_visual.md
+++ b/docs/webapp/webapp_exp_track_visual.md
@@ -93,7 +93,7 @@ using to set up an environment (`pip` or `conda`) are available. Select which re
 
 ### Container
 The Container section list the following information:
-* Image - a pre-configured container that ClearML Agent will use to remotely execute this task (see [Building Docker containers](../getting_started/clearml_agent_docker_exec.md))
+* Image - a pre-configured container that ClearML Agent will use to remotely execute this task (see [Building Task Execution Environments in a Container](../getting_started/clearml_agent_base_docker.md))
 * Arguments - add container arguments
 * Setup shell script - a bash script to be executed inside the container before setting up the task's environment
 
diff --git a/docs/webapp/webapp_exp_tuning.md b/docs/webapp/webapp_exp_tuning.md
index b63dc423..d78ded27 100644
--- a/docs/webapp/webapp_exp_tuning.md
+++ b/docs/webapp/webapp_exp_tuning.md
@@ -72,7 +72,7 @@ and/or Reset functions.
 
 
 #### Default Container
-Select a pre-configured container that the [ClearML Agent](../clearml_agent.md) will use to remotely execute this task (see [Building Docker containers](../getting_started/clearml_agent_docker_exec.md)).
+Select a pre-configured container that the [ClearML Agent](../clearml_agent.md) will use to remotely execute this task (see [Building Task Execution Environments in a Container](../getting_started/clearml_agent_base_docker.md)).
 
 **To add, change, or delete a default container:**
 
diff --git a/docusaurus.config.js b/docusaurus.config.js
index ef4f8ead..da24b73b 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -114,7 +114,7 @@ module.exports = {
             {
               label: 'References',
               to: '/docs/references/sdk/task',
-              activeBaseRegex: '^/docs/latest/docs/(references/|webapp/.*|hyperdatasets/webapp/.*|clearml_agent/(clearml_agent_ref|clearml_agent_env_var)|configs/(clearml_conf|env_vars)|apps/(clearml_task|clearml_param_search))(/.*)?$',
+              activeBaseRegex: '^/docs/latest/docs/(references/.*|webapp/.*|hyperdatasets/webapp/.*|clearml_agent/(clearml_agent_ref|clearml_agent_env_var)|configs/(clearml_conf|env_vars)|apps/(clearml_task|clearml_param_search))(/.*)?$',
             },
             {
               label: 'Best Practices',