diff --git a/Makefile b/Makefile
index 226f1da0d2..7f2059417a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,15 +13,15 @@ MAKEFLAGS+=--no-builtin-rules
 # Project settings
 
 INSTANCE_PORT=8080
-DOCKER_IMAGE=plone/server-dev:6.0.2
-DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.2
-KGS=
+DOCKER_IMAGE=plone/server-dev:6.0.3
+DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.3
+KGS=plone.restapi==8.36.0
 NODEBIN = ./node_modules/.bin
 SCRIPTSPACKAGE = ./packages/scripts
 
 # Plone 5 legacy
-DOCKER_IMAGE5=plone/plone-backend:5.2.9
-KGS5=plone.restapi==8.35.1 plone.volto==4.0.7 plone.rest==3.0.0
+DOCKER_IMAGE5=plone/plone-backend:5.2.10
+KGS5=plone.restapi==8.36.0 plone.volto==4.0.7 plone.rest==3.0.0
 TESTING_ADDONS=plone.app.robotframework==2.0.0 plone.app.testing==7.0.0
 
 # Sphinx variables
diff --git a/api/buildout.cfg b/api/buildout.cfg
index feb689d278..1579cd7ac4 100644
--- a/api/buildout.cfg
+++ b/api/buildout.cfg
@@ -1,7 +1,7 @@
 [buildout]
 index = https://pypi.org/simple/
 extends =
-    http://dist.plone.org/release/6.0.2/versions.cfg
+    http://dist.plone.org/release/6.0.3/versions.cfg
     version-constraints.cfg
     versions.cfg
 parts = instance plonesite site-packages test robot-server
diff --git a/api/versions.cfg b/api/versions.cfg
index d404ee2ec3..abdae1715b 100644
--- a/api/versions.cfg
+++ b/api/versions.cfg
@@ -5,7 +5,7 @@ async-generator = 1.10
 collective.folderishtypes = 3.0.0
 collective.recipe.plonesite = 1.12.0
 h11 = 0.12.0
-plone.restapi = 8.35.1
+plone.restapi = 8.36.0
 plone.volto = 4.0.7
 prompt-toolkit = 2.0.10
 pyOpenSSL = 21.0.0
diff --git a/news/4682.internal b/news/4682.internal
new file mode 100644
index 0000000000..2199a45343
--- /dev/null
+++ b/news/4682.internal
@@ -0,0 +1 @@
+Update to p.restapi 8.36.0 and Plone 6.0.3 @sneridagh