diff --git a/common.yaml.jinja b/common.yaml.jinja
index 05b2f173..c49cc98d 100644
--- a/common.yaml.jinja
+++ b/common.yaml.jinja
@@ -18,6 +18,7 @@ services:
       PGUSER: &dbuser "{{ postgres_username }}"
       PROXY_MODE: "{% if odoo_proxy %}true{% else %}false{% endif %}"
       LIST_DB: "{{ odoo_listdb | tojson }}"
+      KWKHTMLTOPDF_SERVER_URL: "http://wkhtmltopdf:8080"
     {%- if smtp_canonical_default %}
     hostname: "{{ smtp_canonical_default }}"
     {%- endif %}
@@ -112,3 +113,6 @@ services:
       - backup_cache:/root:z
       - filestore:/mnt/backup/src/odoo:z
   {%- endif %}
+
+  wkhtmltopdf:
+    image: acsone/kwkhtmltopdf
diff --git a/devel.yaml.jinja b/devel.yaml.jinja
index 9f6428fc..02632afb 100644
--- a/devel.yaml.jinja
+++ b/devel.yaml.jinja
@@ -111,6 +111,12 @@ services:
     # HACK https://github.com/Kozea/wdb/issues/136
     init: true
 
+  wkhtmltopdf:
+    networks: *public
+    extends:
+      file: common.yaml
+      service: wkhtmltopdf
+
   # Whitelist outgoing traffic for tests, reports, etc.
 {%- for host in whitelisted_hosts %}
   proxy_{{ host|replace(".", "_") }}:
diff --git a/prod.yaml.jinja b/prod.yaml.jinja
index dfeb95fb..dde06310 100644
--- a/prod.yaml.jinja
+++ b/prod.yaml.jinja
@@ -101,6 +101,12 @@ services:
       {%- endif %}
   {%- endif %}
 
+  wkhtmltopdf:
+    extends:
+      file: common.yaml
+      service: wkhtmltopdf
+    restart: unless-stopped
+
 networks:
   default:
     driver_opts: