diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85c6ba3..44d3778 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning][].
 
 ### Documentation
 
--   Various documentation updates, working towards the first public version of the docs.
+-   Update documentation, finalizing the most important sections of the user guide.
 
 ## v0.11.0
 
diff --git a/docs/getting_started.md b/docs/getting_started.md
index 38ac3ad..66be16b 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -122,6 +122,8 @@ By default, a Quarto stage includes the following `cmd` section in the `dvc.yaml
       - dso exec quarto .
 ```
 
+`dso exec quarto` provides additional features such as pre-run scripts and watermarking. For more information see [here](user_guide/quarto.md).
+
 #### Bash Stage
 
 A Bash stage, by default, does not include an additional script. Bash code can be directly embedded in the `dvc.yaml` file:
diff --git a/docs/index.md b/docs/index.md
index b670ab6..0c525aa 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -10,7 +10,6 @@
 getting_started.md
 user_guide/templates.md
 user_guide/params_files.md
-user_guide/dvc.md
 user_guide/pre_commit.md
 user_guide/uv.md
 user_guide/linting.md
diff --git a/docs/user_guide/dvc.md b/docs/user_guide/dvc.md
deleted file mode 100644
index f976cda..0000000
--- a/docs/user_guide/dvc.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# DVC integration
-
-In this section we explain DVC, provide an overview how it works, links to the respective sections of the DVC documentation and how it is integrated with DSO.
-
-TODO
diff --git a/docs/user_guide/quarto.md b/docs/user_guide/quarto.md
index 130b4d8..7e81d13 100644
--- a/docs/user_guide/quarto.md
+++ b/docs/user_guide/quarto.md
@@ -1,5 +1,119 @@
 # Quarto integration
 
-Here we describe how DSO integrates with quarto (`dso exec quarto`, watermarking, ...)
+DSO integrates with [quarto](https://quarto.org/) for authoring reproducible analysis reports.
+Quarto supports both Python and R through Jupyter notebooks (`ipynb`) or quarto markdown (`qmd`) files.
 
-TODO
+DSO provides a wrapper script
+
+```bash
+dso exec quarto
+```
+
+to render a quarto stage that provides additional convenience features:
+
+-   specify quarto configuration in `params.in.yaml` (and benefit from [templating and inheritance](params_files.md#inheritance)).
+-   automatically place HTML report in the `resport` directory of the stage
+-   automatically create an `output` directory before running the quarto script
+-   execute a pre-run script to setup the environment
+-   possibility to add a disclaimer text at the top of each report
+-   possibility to add watermarks to all plots
+
+To benefit from the seamless quarto integration, simply start off with one of the [quarto templates](templates.md#available-templates) provided by `dso create stage`.
+
+## Quarto configuration
+
+Quarto projects can be [configured using a `_quarto.yml` file](https://quarto.org/docs/projects/quarto-projects.html#project-metadata).
+To consolidate all configuration in a single place and to benefit from dso's [hierarchical configuration system](params_files.md#inheritance), we support that quarto configuration can instead be specified in the `dso.quarto` field of a
+`params.in.yaml` file. When running `dso exec quarto`, the corresponding `_quarto.yml` file is dynamically generated
+and removed again after completion.
+
+**`params.in.yaml`**
+
+```yaml
+dso:
+    quarto:
+        before_script: "" # bash snippet to execute before running `dso exec quarto`, use this to setup environment modules etc.
+        author:
+            # please add a complete list of authors. If some authors only contributed to a certain workpackage/stage
+            # you can add the dso.quarto.author section in the respective params.in.yaml and they will be merged.
+            - name: Jane Doe
+              affiliations:
+                  - Example Department
+        format:
+            html:
+                fig-format: svg
+                toc: true
+                code-fold: true
+                embed-resources: true
+        page-layout: full
+        execute:
+            warning: true
+            message: false
+        date: now
+        date-format: YYYY-MMM-DD
+```
+
+The `dso.quarto` section supports any configuration specified in the [quarto documentation](https://quarto.org/docs/projects/quarto-projects.html#project-metadata). Additionally, there are DSO-specific configuration fields that are detailled
+in the next sections:
+
+## Pre-run script
+
+Sometimes it may be required to run a script or bash snippet to setup the environment before running quarto.
+This can be achieved by adding a `dso.quarto.before_script` field to the `params.in.yaml` file.
+
+For instance, you could use the following snippet to load an [enviornment module](https://modules.readthedocs.io/en/latest/)
+if required on your system:
+
+```yaml
+before_script: "module load quarto/1.4.549"
+```
+
+## Disclaimer
+
+If you want to add disclaimer box at the top of every quarto document (for instance, to mark the report as preliminary),
+you can do so using the `dso.quarto.disclaimer` option. For instance, the following configuration...
+
+```yaml
+dso:
+    quarto:
+        disclaimer:
+            title: This is a preliminary document
+            text: |-
+                The results presented in this report have not been reviewed for correctness.
+                Please be careful when interpreting the results.
+```
+
+...would result in the following header of the document:
+
+![quarto disclaimer](../img/dso-quarto-disclaimer.png)
+
+## Watermarking
+
+DSO can automatically add watermarks to all plots in a quarto document. Again, this might be useful for
+marking figures as preliminary. The following configuration
+
+```yaml
+dso:
+    quarto:
+        watermark:
+            text: preliminary
+```
+
+... would result in a watermark as shown here:
+
+![quarto watermark](../img/dso-quarto-watermark.png)
+
+The watermark can be further customized using the following options:
+
+```yaml
+watermark:
+    text: DRAFT!!!111elf
+    tile_size: [100, 100] # in pixel. There will always be an instance of the text in the top left and bottom right corner of the tile
+    font_size: 48
+    font_color: red
+    font_outline_size: 5
+    font_outline_color: "#00FF0099"
+```
+
+On a technical level, watermarking is implemented as a [pandoc filter](https://pandoc.org/filters.html) using [panflute](https://scorreia.com/software/panflute/). After quarto created an intermediate markdown file, pandoc parses it into an abstract syntax tree (AST).
+The pandoc filter traverses the AST and manipulates each image before pandoc continues conversion into the destination format (usually HTML).
diff --git a/img/dso-quarto-disclaimer.png b/img/dso-quarto-disclaimer.png
new file mode 100755
index 0000000..1bc8296
Binary files /dev/null and b/img/dso-quarto-disclaimer.png differ
diff --git a/img/dso-quarto-watermark.png b/img/dso-quarto-watermark.png
new file mode 100755
index 0000000..93656d1
Binary files /dev/null and b/img/dso-quarto-watermark.png differ