diff --git a/.gitignore b/.gitignore
index 8b799fe958..95b3da1cfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ node_modules
 .env
 dist
 .obsidian/**/*
+package-lock.json
\ No newline at end of file
diff --git a/components/docs/RecursiveNavSidebar.vue b/components/docs/RecursiveNavSidebar.vue
index a6f37ce90e..febf0f4f93 100644
--- a/components/docs/RecursiveNavSidebar.vue
+++ b/components/docs/RecursiveNavSidebar.vue
@@ -11,7 +11,7 @@
                 <li class="depth-1">
                     <NuxtLink href="/docs" class="bold" :class="activeSlug === '/docs' || activeSlug === '/docs/' ? 'active' : ''"
                     >
-                            👁️‍🗨️ Overview
+                            👋 Welcome to Kestra
                     </NuxtLink>
                 </li>
             </ul>
diff --git a/components/features/Build.vue b/components/features/Build.vue
index 3655cecc07..67cb639888 100644
--- a/components/features/Build.vue
+++ b/components/features/Build.vue
@@ -26,7 +26,7 @@
                     <div class="card" data-aos="zoom-in">
                         <div class="card-body">
                             <span class="card-icon"><CalendarStartOutline /></span>
-                            <h4 class="card-title">Event-Based</h4>
+                            <h4 class="card-title">Real-Time Events</h4>
                             <p class="card-text">Flow execution based on events from the core or plugins, such as the result of other flows in real-time, detection of files from SFTP or Google Cloud Storage, or results of an SQL query.</p>
                         </div>
                     </div>
@@ -36,7 +36,7 @@
                     <div class="card" data-aos="zoom-in">
                         <div class="card-body">
                             <span class="card-icon"><ClockStart /></span>
-                            <h4 class="card-title">Infinity of triggers</h4>
+                            <h4 class="card-title">Event-driven Triggers</h4>
                             <p class="card-text">Endless possibilities to start a flow through API, using a webhook, waiting for a trigger, or simply starting directly from the Web UI.</p>
                         </div>
                     </div>
diff --git a/components/features/Main.vue b/components/features/Main.vue
index 75fe137dbf..a57be3bfce 100644
--- a/components/features/Main.vue
+++ b/components/features/Main.vue
@@ -1,21 +1,24 @@
 <template>
     <div class="container">
         <Section
-            title="Finally an orchestrator that get it right"
-            subtitle="The Ultimate Orchestrator for Reliable Data Workflows"
+            title="Finally, no dependency conflicts. It just works!"
+            subtitle="Add new workflows in minutes. No ops required."
         >
             <div class="row mb-5">
                 <div class="col-md-6" data-aos="fade-right">
                     <img class="img-fluid" src="/landing/features/declarative.svg" alt="A YAML sample of code for declarative language and construction of Kestra's flows" />
                 </div>
                 <div class="col-md-6 p-5" data-aos="fade-right">
-                    <h3>Declarative code for creating flows</h3>
+                    <h3>API-first design with declarative workflow definition</h3>
                     <ul>
                         <li>
-                            <strong>Easy Workflow Creation:</strong> Build custom workflows quickly and with minimal coding <NuxtLink href="/features/declarative-data-orchestration">using YAML</NuxtLink>.
+                            <strong>Strong typing and autocompletion:</strong> iterate quickly when adding new flows, triggers and tasks. If something is incorrect in your workflow definition, you will know in advance thanks to the built-in syntax validation.
                         </li>
                         <li>
-                            <strong>Intuitive User Interface:</strong> Visualize and manipulate workflow directly from the UI.
+                            <strong>Support for data-mesh:</strong> thanks to the  thanks to the simple <NuxtLink href="/features/declarative-data-orchestration"> YAML interface</NuxtLink>, built-in documentation and blueprints, domain experts can build their own workflows, too.
+                        </li>
+                        <li>
+                            <strong>Intuitive UI built not only for engineers:</strong> when you add workflows directly from the UI, the live-updating topology view helps you see dependencies between processes, systems and tasks. 
                         </li>
                     </ul>
                 </div>
@@ -23,16 +26,16 @@
 
             <div class="row mb-5">
                 <div class="col-md-6 p-5 order-1 order-md-0" data-aos="fade-left">
-                    <h3>Quick and Easy Workflow Building</h3>
+                    <h3>Iterate faster without the overhead of CI/CD</h3>
                     <ul>
                         <li>
-                            <strong>Optimized Task Management:</strong> Seamless task execution in a variety of ways including sequential, parallel, and conditional execution.
+                            <strong>Less time spent babysitting orchestration code:</strong> Seamlessly configure your tasks to run sequentially, in parallel or only based on a specific condition or presence of events without having to navigate convoluted orchestration code bases. 
                         </li>
                         <li>
-                            <strong>Intuitive Orchestration:</strong> Easily manage task dependencies and ensure proper execution order.
+                            <strong>Intuitive dependency management:</strong> Easily manage task dependencies — defining proper execution order is as simple as adding a list of tasks in the order you want them to be executed.
                         </li>
                         <li>
-                            <strong>Flexible Workflow Control:</strong> Full control of workflow orchestration, ensuring tasks are running efficiently.
+                            <strong>Built-in documentation and blueprints:</strong> No need to navigate bulky documentation to figure out the right task or trigger properties — they are available right next to your code editor.
                         </li>
                     </ul>
                 </div>
@@ -46,13 +49,13 @@
                     <img class="img-fluid" src="/landing/features/flowable.svg" alt="A list of flowable tasks such as sequential, parallel, loop, switch, pause and template" />
                 </div>
                 <div class="col-md-6 p-5" data-aos="fade-right">
-                    <h3>Flexible Workflow Scheduling</h3>
+                    <h3>Flexible Event-Driven Workflow Execution</h3>
                     <ul>
                         <li>
-                            <strong>Time-based scheduling:</strong> Workflows run automatically at specific times, such as daily, weekly, or monthly for a regular execution without the need for manual intervention.
+                            <strong>Time-based scheduling:</strong> Workflows run automatically at specific times, such as daily, weekly, or monthly without the need for manual intervention or inspecting crontabs.
                         </li>
                         <li>
-                            <strong>Event-based scheduling:</strong> Trigger workflows to run automatically in response to events, such as the arrival of new data or the completion of other workflows. Automate workflow executions based on real-time events.
+                            <strong>Event-based orchestration:</strong> Automate workflow executions based on real-time events. Trigger workflows to run automatically in response to events, such as the arrival of new data in a database, file detection in your cloud storage bucket, new message in a message queue, or the completion of other workflows. 
                         </li>
                     </ul>
                 </div>
@@ -63,13 +66,10 @@
                     <h3>Execute and Monitor in Real Time</h3>
                     <ul>
                         <li>
-                            <strong>Real-time Workflow Monitoring:</strong> Progress tracking of workflows and individual tasks in real-time.
-                        </li>
-                        <li>
-                            <strong>Actionable Insights:</strong> insights of workflows performances using built-in logs and metrics.
+                            <strong>Real-time Workflow Monitoring:</strong> Progress tracking of workflows and individual tasks in real-time. Troubleshoot failure by replaying failed tasks or doing a full-text search of the workflow execution logs.
                         </li>
                         <li>
-                            <strong>Intuitive User Interface:</strong> Quick Workflow execution and view of the state of tasks directly from the UI.
+                            <strong>Actionable Insights:</strong> you can build custom dashboards to track workflow performance using built-in outputs and metrics. Thanks to a standardized format that Kestra uses, all your Kestra metrics can be visualized in Grafana or Kibana.
                         </li>
                     </ul>
                 </div>
diff --git a/components/features/Ships.vue b/components/features/Ships.vue
index 6a34d5cfb8..a27bc9f1b1 100644
--- a/components/features/Ships.vue
+++ b/components/features/Ships.vue
@@ -1,9 +1,9 @@
 <template>
     <div class="container">
         <Section
-            title="Save on time, stress, and development costs."
-            subtitle="FEATURES"
-            baseline="Save on time, stress, and development costs."
+            title="Save time and development costs."
+            subtitle="Simplicity scales, complexity fails"
+            baseline="Less time spent writing boilerplate orchestration code, more time for what matters to your business"
         >
 
             <div class="row card-group mb-2">
diff --git a/components/features/declaratives/Empower.vue b/components/features/declaratives/Empower.vue
index b362d83ade..52f9f47f91 100644
--- a/components/features/declaratives/Empower.vue
+++ b/components/features/declaratives/Empower.vue
@@ -22,7 +22,7 @@
 
         <div class="row mb-5">
             <div class="col-md-6 p-5 order-1 order-md-0" data-aos="fade-left">
-                <h3>Empower Your Data Team with Declarative Orchestration</h3>
+                <h3>Empower Your Team with Declarative Orchestration</h3>
                 <ul>
                     <li>
                         <strong>Accelerate Time to Value:</strong> Declarative orchestration modernized the creation and maintenance of data pipelines, enabling data teams to deliver results faster and more efficiently.
diff --git a/components/home/Features.vue b/components/home/Features.vue
index 87ce506bdd..d5209c99a5 100644
--- a/components/home/Features.vue
+++ b/components/home/Features.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="container">
-        <Section subtitle="Stand Out with Kestra's Exclusive Features" title="Enhanced Workflow Efficiency">
+        <Section subtitle="Simplicity scales, complexity fails" title="Simple, Scalable and Fast Orchestration">
             <div class="row card-group mb-2">
                 <div class="col-md-4 mb-4">
                     <div class="card" data-aos="zoom-in">
                         <div class="card-body">
                             <span class="card-icon"><CalculatorVariantOutline /></span>
-                            <h4 class="card-title">Powerful Data Processing</h4>
-                            <p class="card-text">Execute complex data processing without the need for extensive coding skills</p>
+                            <h4 class="card-title">Declarative and imperative workflows</h4>
+                            <p class="card-text">Decide based on your use case how declarative or imperative you want your workflows to be. Write your business logic in Python, R, Node.js or Julia, and orchestrate it declaratively.</p>
                         </div>
                     </div>
                 </div>
@@ -16,8 +16,8 @@
                     <div class="card" data-aos="zoom-in">
                         <div class="card-body">
                             <span class="card-icon"><Lan /></span>
-                            <h4 class="card-title">Robust Scheduling and Orchestration</h4>
-                            <p class="card-text">Manage data workflows with flexible scheduling options and orchestrate all types of workflows</p>
+                            <h4 class="card-title">Scalable architecture as a foundation</h4>
+                            <p class="card-text">Kestra's architecture is built on top of proven and time-tested technologies including Postgres, Kafka and Elasticsearch.</p>
                         </div>
                     </div>
                 </div>
@@ -26,8 +26,8 @@
                     <div class="card" data-aos="zoom-in">
                         <div class="card-body">
                             <span class="card-icon"><GoogleCirclesExtended /></span>
-                            <h4 class="card-title">Extensive Library of plugins</h4>
-                            <p class="card-text">Integrate with various systems and services from 3rd party sources or build your own plugins</p>
+                            <h4 class="card-title">Rich plugin ecosystem</h4>
+                            <p class="card-text">Integrate with any source system, database or data tool, and build your own plugins and blueprints to eliminate boilerplate code and automate repetitive tasks.</p>
                         </div>
                     </div>
                 </div>
@@ -36,8 +36,8 @@
                     <div class="card" data-aos="zoom-in">
                         <div class="card-body">
                             <span class="card-icon"><OpenInApp /></span>
-                            <h4 class="card-title">Increase Productivity and Efficiency</h4>
-                            <p class="card-text">Create and manage your workflows using the low code editor or write them <NuxtLink href="/features/declarative-data-orchestration">in YAML</NuxtLink></p>
+                            <h4 class="card-title">Fast development cycles</h4>
+                            <p class="card-text">Create flows in a simple <NuxtLink href="/features/declarative-data-orchestration">declarative YAML config</NuxtLink> directly from the UI with autocompletion, syntax validation and built-in documentation. Or use our official VS Code extension to integrate your workflows with Git and CI/CD systems.</p>
                         </div>
                     </div>
                 </div>
@@ -46,8 +46,8 @@
                     <div class="card" data-aos="zoom-in">
                         <div class="card-body">
                             <span class="card-icon"><RefreshAuto /></span>
-                            <h4 class="card-title">Reliable Automated Production</h4>
-                            <p class="card-text">Eliminate bottlenecks with Kestra's reliable and automated workflows</p>
+                            <h4 class="card-title">API-first design</h4>
+                            <p class="card-text">Because every action in Kestra is API-driven, there are no limits to what you can automate, from changing flow and task configuration using internal tools, to triggering, adding or modifying workflows in any way you can imagine.</p>
                         </div>
                     </div>
                 </div>
@@ -56,8 +56,8 @@
                     <div class="card" data-aos="zoom-in">
                         <div class="card-body">
                             <span class="card-icon"><CloudOutline /></span>
-                            <h4 class="card-title">Deploy anywhere with no point of failure</h4>
-                            <p class="card-text">From only a few executions to millions, without hassle, in the cloud or on-premise</p>
+                            <h4 class="card-title">Deploy anywhere with no single point of failure</h4>
+                            <p class="card-text">Scale your data platform from only a few executions to millions, without hassle. You can deploy Kestra on-prem and on Cloud using our official Helm chart, Terraform provider, or a manual installation using a single binary. </p>
                         </div>
                     </div>
                 </div>
diff --git a/components/home/How.vue b/components/home/How.vue
index 91d87950ea..576c2de48c 100644
--- a/components/home/How.vue
+++ b/components/home/How.vue
@@ -1,15 +1,15 @@
 <template>
     <div class="container">
         <Section
-            title="Performant and Scalable Data Operations"
-            subtitle="Master Data Workflows"
+            title="Scheduled and Event-Driven Data Operations"
+            subtitle="Simpler and Faster Data Workflows"
         >
             <div class="row mb-5">
                 <div class="col-md-6 p-5" data-aos="fade-right">
                     <p class="overline">Step 1</p>
                     <h3>Define your workflows</h3>
                     <p>
-                        Declare all <NuxtLink href="/features/declarative-data-orchestration">your flows in Yaml</NuxtLink>, specify all tasks that need to be executed, the input and output data, and any dependencies between steps.
+                        Declare all <NuxtLink href="/features/declarative-data-orchestration">your flows in YAML</NuxtLink>, specify all tasks that need to be executed, the input and output data, and any dependencies between steps.
                     </p>
                 </div>
                 <div class="col-md-6" data-aos="fade-right">
diff --git a/components/home/UI.vue b/components/home/UI.vue
index 52e108f365..5afe82f2e9 100644
--- a/components/home/UI.vue
+++ b/components/home/UI.vue
@@ -4,7 +4,7 @@
             <Section
                 class="dark"
                 subtitle="All-Inclusive Dashboard"
-                title="Empower Developers with a Comprehensive, User-Friendly Interface"
+                title="Empower Your Team with a Comprehensive, User-Friendly Orchestration Interface"
             >
                 <div class="row mb-5">
                     <div class="col-lg-8">
@@ -19,7 +19,7 @@
                             <div class="card-body">
                                 <p class="mb-0">
                                     <span class="card-icon rounded-5"><WrenchOutline /></span>
-                                    Built-in low code editor for your flows
+                                    Built-in editor to define flows, SQL queries and custom scripts
                                 </p>
                             </div>
                         </div>
@@ -27,7 +27,7 @@
                             <div class="card-body">
                                 <p class="mb-0">
                                     <span class="card-icon rounded-5"><ChartTimelineVariant /></span>
-                                    Execute and monitor directly from the user interface
+                                    Dashboards to monitor your system's health
                                 </p>
                             </div>
                         </div>
@@ -35,7 +35,7 @@
                             <div class="card-body">
                                 <p class="mb-0">
                                     <span class="card-icon rounded-5"><ApplicationBracketsOutline /></span>
-                                    Simple declarative language editor
+                                    Simple declarative editor with live-updating DAG view
                                 </p>
                             </div>
                         </div>
@@ -43,7 +43,7 @@
                             <div class="card-body">
                                 <p class="mb-0">
                                     <span class="card-icon rounded-5"><ViewDashboardVariantOutline /></span>
-                                    Complete and comprehensive dashboard
+                                    Language-agnostic interface for scheduled and event-driven flows
                                 </p>
                             </div>
                         </div>
diff --git a/content/careers/developper-advocate.md b/content/careers/developper-advocate.md
deleted file mode 100644
index ff5eb4bdbc..0000000000
--- a/content/careers/developper-advocate.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: "Developer Advocate"
-type: Engineering
-draft: true
----
-
-# Developer Advocate
-
-## What you will do:
-
-Kestra is looking for a Developer Advocate who loves to educate and engage with developers, and has a passion for open source communities.
-
-- **Content:** Create and deliver engaging content, such as, but not limited to, blog posts, technical content, presentations, live streams, etc.
-- **Advocate:** While still representing as a thought leader in different communities, you will still advocate for Kestra’s community internally, and promote Kestra externally
-- **Communities:** Attend, speak at, and sponsor in-person and/or virtual events at various developer communities. Be a thought leader in the #DevRel space
-- **Fun:** Create fun and engaging content for various social media platforms. Whether it’s writing, video creation and technical or soft skills to educate developers
-- **Community:** Actively engaging with developers on various social media platforms (ie: Twitter, Slack, LinkedIn, GitHub Discussions, Reddit, StackOverflow, etc)
-
-## What we’re looking for:
-
-- 2+ years experience as a Developer Advocate, or similar activities
-- Some experience in at least two programming languages or frameworks (JS, TS, Java, Python, …)
-- Native US/UK with excellent spoken and written English
-- You love to teach developers how to build cool stuff
-- Entrepreneurial mindset
-- Ability to work with a diverse company (and team) located globally, working across different time zones
-- Ability to take the initiative and work independently
-
-## Bonus points:
-
-- Professional prior experience as a Data Engineer with extensive knowledge of the big data ecosystem, key technologies (especially Python, Kafka, Flink, Spark, data lakes and warehouses)
-- Experience building demo apps and producing developer-centric content
-- Experience speaking at community events and participating in online forums
-- Experience growing and nurturing open source community projects
diff --git a/content/careers/growth-marketing-manager.md b/content/careers/growth-marketing-manager.md
deleted file mode 100644
index b60055bcec..0000000000
--- a/content/careers/growth-marketing-manager.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-title: "Growth Marketing Manager"
-type: Marketing
-draft: true
----
-
-# Growth Marketing Manager
-
-The intersection of marketing, product, and data!
-
-## What you will do:
-
-- Identify and determine essential metrics that drive the long-term success of our work.
-- Set strategy and tactics, launch campaigns, track & report performance.
-- Drive the content & community process including blogs, social, influencers, brand building, partnership strategy for co-marketing, PR, and more.
-- Work with the leadership team to scale the marketing organization.
-- Develop a thorough understanding of our target audiences and their needs, in order to communicate effectively with them.
-- Approach problems with the flexibility needed to innovate.
-- Create processes that help us scale.
-- Recruit the best team around you.
-
-## What we’re looking for:
-
-- You bring vision, enthusiasm, spontaneity, creativity, efficiency, autonomy
-- You bring deep knowledge of growth marketing techniques and tactics
-- You are experienced in B2B / SaaS / Data
-- Preferably, 4+ years of hands-on digital marketing experience
-- Strong analytical and quantitative expertise in marketing platforms, best practices, attribution, and marketing analytics
-- An understanding of important SEO factors including quality content, keyword focus, URL structure, etc…
-- Hands-on experience building compelling website, landing pages…
-- Hands-on experience in building marketing workflows and campaigns.
-- Experience in multi-stage automated marketing campaigns, funnel to conversion.
-- Must be a self-starter with the ability to pay attention to detail, prioritize, multi-task and meet deadlines.
-- You love working in a high-energy and collaborative environment
-- You value direct and honest feedback, but you know how to communicate it so it betters your partners' (coworkers and clients) work and happiness.
-
-## Bonus points:
-
-- Experience or love for open source projects
-- Speak french
diff --git a/content/careers/senior-devops-engineer.md b/content/careers/senior-devops-engineer.md
deleted file mode 100644
index 6c1134b653..0000000000
--- a/content/careers/senior-devops-engineer.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-title: "Senior DevOps Engineer"
-type: Engineering
-draft: true
----
-# Senior DevOps Engineer
-
-## What you will do:
-
-- Design, Architect & Implement our SAAS offering for Kestra.
-- Automate the provisioning of customer Kestra environnement.
-- Assists in defining automated monitoring, deployment and repair strategies using a wide variety of Ops tools and monitoring platforms
-- Assists with the Continuous Integration and Continuous Deployment (CI/CD) processes
-- Diagnoses, isolates, and debugs application problems and performs problem resolution
-- Design and implement novel technical solutions that raises engineering productivity throughout your team
-- Relentlessly improve your team’s DORA metrics including cycle time, deployment frequency, change failure rate, and mean time to recovery.
-
-## What we’re looking for:
-
-- 7+ years experience operating in a SRE/DevOps/Infra role.
-- Speaking/writing in English and preferably French as well
-- Experience with one or more general purpose programming languages including but not limited to: Bash, Python or Go.
-- Experience with AWS, GCP, or Azure technologies
-- Experience with containers and Kubernetes based applications running in the public cloud or in on premises data centers (you’ll have both available to you)
-- Comprehension of GitOps and managing Infrastructure as Code (IaC) such as Terraform, CloudFormation, Chef, or Ansible.
-- Comfortable working on distributed systems, databases, networking, storage, and multi-tenant services, and Unix/Linux environments.
-- Familiarity with Linux fundamentals and Bash scripting.
-- Track record of learning new technologies and concepts quickly.
-- Ability to work both autonomously and collaboratively, as needed.
-- Strong written and verbal communications skills.
-
-## Bonus points:
-
-- Work previously on the SAAS offering that needs deployment for each customer
-- Excellent analytical, decision-making, and problem-solving skills
-- Experience working on highly scalable cloud infrastructures
-- Open-source contributions with a variety of technologies
-- Startup or small company experience
-- Ability to work in an advisory capacity to identify key technical and business problems, develop and evaluate alternative solutions and make recommendations,
-- The ability to understand situations or problems by organizing information in a logical way. This includes anticipating problems for root causes and alternative solutions.
\ No newline at end of file
diff --git a/content/docs/01.getting-started.md b/content/docs/01.getting-started.md
index 6a72106c81..c1c579c566 100644
--- a/content/docs/01.getting-started.md
+++ b/content/docs/01.getting-started.md
@@ -2,27 +2,28 @@
 title: 🚀 Getting started
 ---
 
-This page shows how to start Kestra and create your first flow.
+Start Kestra using Docker-Compose and create your first flow.
 
-## Prerequisites
+::alert{type="info"}
+**Prerequisites**: Make sure that Docker is installed in your environment. We recommend [Docker Desktop](https://docs.docker.com/get-docker/).
+::
 
-Make sure that Docker is installed in your environment. We recommend [Docker Desktop](https://docs.docker.com/get-docker/).
+---
 
 ## Start Kestra
 
-### Download Docker Compose file
 
 Download the Docker Compose file using the following command:
 
 ```bash
-curl -o docker-compose.yml https://raw.githubusercontent.com/kestra-io/kestra/develop/docker-compose.yml
+curl -o docker-compose.yml \
+https://raw.githubusercontent.com/kestra-io/kestra/develop/docker-compose.yml
 ```
 
 If you don't have `curl` installed, you can download the [Docker Compose file](https://github.com/kestra-io/kestra/blob/develop/docker-compose.yml) manually and save it as `docker-compose.yml`.
 
-### Start your server
 
-Make sure the Docker is up and running. Then, run the following command:
+Make sure that Docker is running. Then, use the following command to start Kestra server:
 
 ```bash
 docker compose up -d
@@ -31,10 +32,13 @@ docker compose up -d
 Open [http://localhost:8080](http://localhost:8080) in your browser to launch the UI.
 
 
-> If you want to extend your Docker Compose file, modify container networking, or if you have any other issues using this Docker Compose file, check the [Troubleshooting Guide](14.troubleshooting.md).
+::alert{type="info"}
+If you want to extend your Docker Compose file, modify container networking, or if you have any other issues using this Docker Compose file, check the [Troubleshooting Guide](14.troubleshooting.md).
+::
 
+---
 
-## Create your first flow
+## Create Your First Flow
 
 Navigate to **Flows** in the left menu, then click the "Create" button and paste the following configuration to create your first flow:
 
@@ -51,17 +55,20 @@ Click on **Save** and start your first execution via the **Create Execution** bu
 
 ![Your first flow saved](/docs/getting-started/saved.png)
 
+
 ::next-link
 [For a more detailed introduction to Kestra, check our Tutorial](./02.tutorial/index.md)
 ::
 
+---
+
 ## Next Steps
 
-Congrats on your first flow! :rocket:
+Congrats on your first flow! :clap:
 
 Next, we suggest following the documentation in this order:
 - Check the [tutorial](./02.tutorial/index.md) 
 - Learn core [concepts](./03.concepts/index.md)
 - Read the [Developer Guide](./05.developer-guide/index.md) for more advanced concepts
 - Check the available [Plugins](../plugins/index.md) to integrate with external systems and automate your tasks
-- [Deploy](./09.administrator-guide/index.md) your Kestra instance to production environments.
+- [Deploy](./09.administrator-guide/index.md) your Kestra instance to remote development and production environments.
diff --git a/content/docs/02.tutorial/01.fundamentals.md b/content/docs/02.tutorial/01.fundamentals.md
index 3118d28b18..4ad2974177 100644
--- a/content/docs/02.tutorial/01.fundamentals.md
+++ b/content/docs/02.tutorial/01.fundamentals.md
@@ -5,7 +5,7 @@ title: Fundamentals
 This section will guide you through the fundamentals of Kestra.
 
 ::alert{type="info"}
-We assume you followed the [Getting Started](../01.getting-started.md) guide before this tutorial.
+To install Kestra, check the [Getting Started](../01.getting-started.md).
 ::
 
 ## Flows
diff --git a/content/docs/05.developer-guide/09.templates.md b/content/docs/05.developer-guide/09.templates.md
index d4fd93fbd9..0c9ff3c672 100644
--- a/content/docs/05.developer-guide/09.templates.md
+++ b/content/docs/05.developer-guide/09.templates.md
@@ -1,7 +1,11 @@
 ---
-title: Templates
+title: Templates (deprecated)
 ---
 
+::alert{type="warning"}
+⚠️ Templates are deprecated. Please use subflows instead of templates. See the [Migrations section](../15.migrations/templates.md) explaining how you can migrate from templates to subflows.
+::
+
 Templates are lists of tasks that can be shared between flows. You can define a template and call it from other flows, allowing them to share a list of tasks and keep these tasks updated without changing your flow.
 
 All tasks in a template will be executed sequentially; you can provide the same tasks that are found in a *standard* flow, including an *errors* branch.
diff --git a/content/docs/15.migrations/index.md b/content/docs/15.migrations/index.md
new file mode 100644
index 0000000000..272d11ca6f
--- /dev/null
+++ b/content/docs/15.migrations/index.md
@@ -0,0 +1,9 @@
+---
+title: 🛠️ Migrations
+---
+
+Upgrades and migrations are sometimes necessary. This section covers what's being phased out and what you can use instead.
+
+
+<ChildTableOfContents :max="1" />
+
diff --git a/content/docs/15.migrations/templates.md b/content/docs/15.migrations/templates.md
new file mode 100644
index 0000000000..bd3f3fdfe9
--- /dev/null
+++ b/content/docs/15.migrations/templates.md
@@ -0,0 +1,157 @@
+---
+title: Deprecation of Templates
+---
+
+Templates are marked as deprecated starting from the 0.11.0 release. Please use subflows instead.
+
+
+## Why are templates are being deprecated?
+
+1. Subflows are more powerful — subflows provide the same functionality as templates while simultaneously being more flexible than templates. For instance,  `inputs` are not allowed in a template because a template is only a list of tasks that get copied to another flow that references it. In contrast, when invoking a subflow, you can parametrize it with custom parameters. This way, subflows allow you to define workflow logic once and invoke it in other flows with custom parameters.  
+2. Subflows are more transparently reflected in the topology view and don't require copying tasks.
+
+
+---
+
+## Templates :warning: 
+
+A typical template has an ID, a namespace, and a list of tasks. Here is an example template:
+
+```yaml
+id: mytemplate
+namespace: dev
+tasks:
+  - id: workingDir
+    type: io.kestra.core.tasks.flows.WorkingDirectory
+    tasks:
+      - id: bash
+        type: io.kestra.plugin.scripts.shell.Commands
+        commands:
+          - mkdir -p out
+          - echo "Hello from 1" >> out/output1.txt
+          - echo "Hello from 2" >> out/output2.txt
+          - echo "Hello from 3" >> out/output3.txt
+          - echo "Hello from 4" >> out/output4.txt
+        runner: PROCESS
+      - id: out
+        type: io.kestra.core.tasks.storages.LocalFiles
+        outputs:
+          - out/**
+  - id: each
+    type: io.kestra.core.tasks.flows.EachParallel
+    value: "{{outputs.out.uris | jq('.[]')}}"
+    tasks:
+      - id: path
+        type: io.kestra.core.tasks.debugs.Return
+        format: "{{taskrun.value}}"
+      - id: contents
+        type: io.kestra.plugin.scripts.shell.Commands
+        commands:
+          - cat "{{taskrun.value}}"
+        runner: PROCESS
+```
+
+You can trigger it in a flow using the `io.kestra.core.tasks.flows.Template` task:
+
+```yaml
+id: templatedFlow
+namespace: dev
+
+tasks:
+  - id: first
+    type: io.kestra.core.tasks.log.Log
+    message: first task
+
+  - id: template
+    type: io.kestra.core.tasks.flows.Template
+    namespace: dev
+    templateId: mytemplate
+
+  - id: last
+    type: io.kestra.core.tasks.log.Log
+    message: last task
+```
+
+This example shows that templates are pretty restrictive — you can only invoke them as-is. You cannot set custom input values, and there is no link from this flow to the template. In contrast, subflows can be parametrized, and you can navigate to the subflow in the topology view. From the 0.11.0 release, you can also expand and collapse a subflow (child flow) to inspect the available tasks directly from the parent flow.
+
+---
+
+## Subflows ✅ 
+
+To migrate from a template to a subflow, you can create a flow that is a 1:1 copy of your template. This flow can then be invoked as a subflow the same way you used to invoke a template (only using a different task). 
+
+In our example, we can create a new flow called `mytemplate` in a namespace `dev`. This flow will be invoked from a parent flow as a subflow.
+
+Then, to create a child flow (a subflow), you only need to change the following values in the `templatedFlow`:
+- Change the `io.kestra.core.tasks.flows.Template` task type to `io.kestra.core.tasks.flows.Flow`
+- Change the `templateId` to `flowId`.
+
+See the example below showing how you can invoke a subflow from a parent flow:
+
+```yaml
+id: parentFlow
+namespace: dev
+tasks:
+  - id: subflow
+    type: io.kestra.core.tasks.flows.Flow
+    namespace: dev
+    flowId: mytemplate
+```
+
+And here is a complete example showing how a template task can be migrated to a subflow task:
+
+```yaml
+id: parentFlow
+namespace: dev
+
+tasks:
+  - id: first
+    type: io.kestra.core.tasks.log.Log
+    message: first task
+
+  - id: subflow
+    type: io.kestra.core.tasks.flows.Flow
+    namespace: dev
+    flowId: mytemplate
+
+  - id: last
+    type: io.kestra.core.tasks.log.Log
+    message: last task
+```
+
+If your subflow has input parameters and you want to override them when calling the subflow, you can configure them as follows:
+
+```yaml
+id: parentFlow
+namespace: dev
+
+tasks:
+  - id: first
+    type: io.kestra.core.tasks.log.Log
+    message: first task
+
+  - id: subflow
+    type: io.kestra.core.tasks.flows.Flow
+    namespace: dev
+    flowId: mytemplate
+    inputs:
+      myIntegerParameter: 42
+      myStringParameter: hello world!
+
+  - id: last
+    type: io.kestra.core.tasks.log.Log
+    message: last task
+```
+
+---
+
+## Side-by-side comparison
+
+You can look at both a flow with a template task and a flow with a subflow task side by side to see the difference in syntax:
+
+
+![template-vs-subflow](/docs/migrations/template-vs-subflow.png)
+
+
+If you still have questions about migrating from templates to subflows, reach out via our [Community Slack](https://kestra.io/slack).
+
diff --git a/content/docs/index.md b/content/docs/index.md
index 2b43c033f6..8cd1f12c75 100644
--- a/content/docs/index.md
+++ b/content/docs/index.md
@@ -1,32 +1,54 @@
 ---
-title: 📓 Overview
+title: 📓 Welcome to Kestra
 ---
 
-Kestra is an open-source, event-driven orchestrator that simplifies data operations and improves collaboration between engineers and business users. By bringing Infrastructure as Code best practices to data pipelines, Kestra allows you to build reliable workflows and manage them with confidence.
+Kestra is an open-source data orchestrator that makes both **scheduled** and **event-driven workflows** easy. By bringing Infrastructure as Code best practices to data pipelines, you can build reliable data pipelines and manage them with confidence.
 
-Kestra allows you to [create flows](./05.developer-guide/01.flow.md) directly from the UI in just a few lines of code. Thanks to the declarative YAML interface for defining orchestration logic, business stakeholders can participate in the data pipeline creation process, instead of making that an engineering-only endeavor. 
+In just a few lines of code, you can [create a flow](./05.developer-guide/01.flow.md) directly from the UI. Thanks to the declarative YAML interface for defining orchestration logic, business stakeholders can participate in the workflow creation process, instead of making that an engineering-only endeavor. 
 
-![video-intro](https://kestra.io/video.gif)
+Because the UI automatically adjusts the YAML definition any time you make changes to a workflow from the UI or via an API call, the orchestration logic is stored declaratively in code, even if some workflow components are modified in other ways (UI, CI/CD, Terraform, API call).
 
+![Adding new tasks in the UI](https://kestra.io/adding-tasks.gif)
 
-The UI automatically adjusts the YAML definition any time you make changes to a workflow from the UI or via an API call. Therefore, the orchestration logic is stored declaratively in code, even if some workflow components are modified in other ways.
 
-![Adding new tasks in the UI](https://kestra.io/adding-tasks.gif)
+---
+
+## Design Principles
+
+**Simple is better than complex**: you can build your first scheduled workflow in less than 5 minutes from the UI without even having to think about managing local environments, infrastructure, deployments or CI/CD. Simplicity scales, complexity fails. We believe that, in the long run, a simple orchestration API is less likely to fail than convoluted client-side orchestration tied to a single programming language.
+
+**Real-time & event-driven**: Kestra is built with real-time use cases in mind. You can create flows, run them, and see all their logs in real-time. Kestra can be used along with Kafka to process a large number of events at any scale.
+
+**Scalable architecture as a foundation**: Kestra's [architecture](./08.architecture.md) is built with proven and time-tested technologies including Postgres, Kafka and Elasticsearch. The [Enterprise Edition](/enterprise) can can handle millions of executions per second without breaking a sweat thanks to a backend built on top of Kafka and Elasticsearch.
+
+**API-first design**: every action in Kestra is API-driven. In contrast to Python-based workflows that heavily rely on client-side imlementation in a single language, Kestra's workflow definition is a config that gets sent as a payload to an API call. 
+- You define in a YAML config **which tasks** do you want to orchestrate, and **how**, and that config is sent to Kestra's backend via an API call. 
+- This **microservice-oriented design** makes your orchestration language-agnostic, and opens up the door to all sorts of automations. With every action behind the API, there are no limits to what you can automate, from changing task configuration using your internal tools, to triggering, adding or modifying workflows in any way you can imagine. All that without having to redeploy any code or rebuild Docker images.  
+
+**Portability**: Kestra's workflows are programming-language agnostic. Your tasks can be written in Python, R, Node.js, Julia, Rust, Bash or Powershell. You can also extend the platform via custom plugins, triggers and tasks.
 
+**Declarative AND imperative**: we believe that declarativeness is a spectrum and you decide about the degree of how declarative or imperative you want your tasks to be. You can write as simple or as [complex](./05.developer-guide/02.tasks.md#flowable-tasks) workflows as you want them to be. 
 
-## Principles
+**Separation of orchestration and business logic**: mixing the two can result in a complicated data platform that ties you to a specific platform. Kestra can orchestrate business logic written in any language or platform without you having to make ANY modifications to your code. No Python decorators are required, and no need to worry about breaking your orchestration system due to misaligned Python package dependencies. 
 
-- **Simple**: Kestra workflows are written in YAML. It is a declarative syntax that allows you to write even [complex](./05.developer-guide/02.tasks.md#flowable-tasks) workflows regardless of the programmic language your business logic is written in.
-- **Extensible**: The entire foundation of Kestra is built upon plugins. You can use an existing plugin from our [plugin library](../plugins/index.md) or build your [own](./10.plugin-developer-guide/index.md).
-- **Real-time**: Kestra is built with real-time use cases in mind. You can create flows, run them, and see all their logs in real-time.
-- **Scalable**: Kestra's [architecture](./08.architecture.md) allows scaling according to your workload. The [Enterprise Edition](/enterprise) can scale even more thanks to Kafka and Elasticsearch and can handle millions of executions without breaking a sweat.
-- **Cloud-native**: Built with the cloud in mind, Kestra uses cloud-native technologies and allows you to [deploy your server anywhere](./09.administrator-guide/02.deployment/index.md).
+**Extensible**: Kestra is built on top of a plugins ecosystem. You can use an existing plugin from our [plugin library](../plugins/index.md) or build your [own](./10.plugin-developer-guide/index.md). You don't even need to know much of Java to build your own plugin — as long as your custom script can be packages into a Docker container, you can use it similarly to [script plugins](https://github.com/kestra-io/plugin-scripts).
 
+**Cloud-native**: Built with the cloud in mind, Kestra uses cloud-native technologies and allows you to [deploy your server anywhere](./09.administrator-guide/02.deployment/index.md).
 
-## Usage
 
-- **Data orchestrator**: Handle complex workflows and process large datasets. Extract, transform, and load datasets according to your needs (ETL or ELT).
-- **Distributed crontab**: Schedule and monitor every process, regardless of whether it's a data workflow, business process or infrastructure management.
-- **Event-driven workflow**: React to external events to decouple processes and remove dependencies instead of managing them.
+---
+
+## Kestra Use Cases
+
+**Data orchestrator**: orchestrate ETL and ELT workflows and process data at any scale.
+
+**Process orchestrator**: coordinate and automate your business processes using a collaborative UI from where engineers can work in tandem with business stakeholder. You can use Kestra to build an internal platform where domain experts can adjust task properties and SQL queries without having to file a ticket to developers.
+
+**Distributed scheduler**: schedule and monitor every process, regardless of whether it's a data workflow, business process or infrastructure management.
+
+**Event-driven workflows**: React to external events sent from Kafka, SQS, Google PubSub and more and use Kestra to decouple processes. The best way to manage dependencies is to remove them — Kestra's trigger system helps you decouple systems in a trasparent way.
+
+![video-intro](https://kestra.io/video.gif)
+
 
-Read the [Getting started](./01.getting-started.md) guide to create your first flow.
+It's time to [get started](./01.getting-started.md)! 🚀 Move on to the next section to launch Kestra and create your first flow.
diff --git a/public/docs/migrations/template-vs-subflow.png b/public/docs/migrations/template-vs-subflow.png
new file mode 100644
index 0000000000..152b9568c5
Binary files /dev/null and b/public/docs/migrations/template-vs-subflow.png differ