diff --git a/dev.cfg b/dev.cfg
index b5e89fd..8a5b102 100644
--- a/dev.cfg
+++ b/dev.cfg
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-    plone-5.2.x.cfg
+    plone-6.0.x.cfg
     sources.cfg
 
 extensions =
diff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg
new file mode 100644
index 0000000..9f6a43b
--- /dev/null
+++ b/plone-6.0.x.cfg
@@ -0,0 +1,8 @@
+[buildout]
+extends =
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/plone-6.0.x.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
+    https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg
+    base.cfg
+
+develop =
diff --git a/prod.cfg b/prod.cfg
index 16ef8e5..54517ec 100644
--- a/prod.cfg
+++ b/prod.cfg
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-    https://dist.plone.org/release/5.2.9/versions.cfg
+    https://dist.plone.org/release/6.0.9/versions.cfg
     base.cfg
     port.cfg
 
diff --git a/sources.cfg b/sources.cfg
index 6ea8531..36cc55d 100644
--- a/sources.cfg
+++ b/sources.cfg
@@ -3,4 +3,4 @@ imio = git://github.com/IMIO
 imio_push = git@github.com:IMIO
 
 [sources]
-plonemeeting.portal.core = git ${remotes:imio}/plonemeeting.portal.core.git pushurl=${remotes:imio_push}/plonemeeting.portal.core.git
+plonemeeting.portal.core = git ${remotes:imio}/plonemeeting.portal.core.git pushurl=${remotes:imio_push}/plonemeeting.portal.core.git branch=plone6