diff --git a/docker-compose.yml b/docker-compose.yml
index dbfcbdc1d4..a948fa04e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,8 @@ services:
       - DBAAS_DBAAS_OP_CHANNEL=${DBAAS_DBAAS_OP_CHANNEL}
       - DBAAS_ALLOW_UNSUPPORTED_OPERATORS=${DBAAS_ALLOW_UNSUPPORTED_OPERATORS:-0}
       - PERCONA_TEST_DBAAS_PMM_CLIENT=${PERCONA_TEST_DBAAS_PMM_CLIENT}
+      - GF_RENDERING_SERVER_URL=http://renderer:8081/render
+      - GF_RENDERING_CALLBACK_URL=https://pmm-server:8443/graph/
       # - PERCONA_TEST_PLATFORM_ADDRESS=https://check.localhost
       # - PERCONA_TEST_PLATFORM_INSECURE=1
       # - PERCONA_TEST_PLATFORM_PUBLIC_KEY=<public key>
@@ -101,6 +103,13 @@ services:
     #     /opt/entrypoint.sh
     #   "
 
+  renderer:
+    image: grafana/grafana-image-renderer:latest
+    networks:
+      - ${NETWORK:-default}
+    ports:
+      - 8081:8081
+
   # PMM with external DBs
   ch:
     profiles:
diff --git a/update/ansible/playbook/tasks/roles/grafana/files/grafana.ini b/update/ansible/playbook/tasks/roles/grafana/files/grafana.ini
index 10318273f2..64038076a3 100644
--- a/update/ansible/playbook/tasks/roles/grafana/files/grafana.ini
+++ b/update/ansible/playbook/tasks/roles/grafana/files/grafana.ini
@@ -37,6 +37,8 @@ format = console
 enable_gzip = true
 # The full public facing url
 root_url = https://%(domain)s/graph
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to false for compatibility reasons.
+serve_from_sub_path = true
 
 #################################### Snapshots ###########################
 [snapshots]
diff --git a/update/ansible/playbook/tasks/roles/nginx/files/conf.d/pmm.conf b/update/ansible/playbook/tasks/roles/nginx/files/conf.d/pmm.conf
index 9a4633467f..e8b766a0ab 100644
--- a/update/ansible/playbook/tasks/roles/nginx/files/conf.d/pmm.conf
+++ b/update/ansible/playbook/tasks/roles/nginx/files/conf.d/pmm.conf
@@ -132,7 +132,6 @@
     location /graph {
       proxy_cookie_path / "/;";
       proxy_pass http://127.0.0.1:3000;
-      rewrite ^/graph/(.*) /$1 break;
       proxy_read_timeout 600;
       proxy_http_version 1.1;
       proxy_set_header Connection $connection_upgrade;