diff --git a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st
index a5add2ab..7e5da333 100644
--- a/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st
+++ b/repository/BaselineOfOpenPonk/BaselineOfOpenPonk.class.st
@@ -100,22 +100,33 @@ BaselineOfOpenPonk >> loadPetitParserAndRoassal3 [
 BaselineOfOpenPonk >> loadRoassal3 [
 	"Roassal3 needs to be loaded this way because different version of it is already included in Pharo 10+"
 
-	| exporters |
-	Smalltalk at: #BaselineOfRoassal3Exporters ifPresent: [ ^ self ].
+	| exporters layouts |
+	
+	Smalltalk at: #BaselineOfRoassalExporters ifPresent: [ ^ self ].
+
+	layouts := Metacello new.
+	layouts
+		baseline: 'RoassalLayouts';
+		repository: 'github://pharo-graphics/RoassalLayouts:136a902';
+		lock;
+		onConflictUseLoaded.
 
 	exporters := Metacello new.
 	exporters
-		baseline: 'Roassal3Exporters';
-		repository: 'github://ObjectProfile/Roassal3Exporters:6c61b1f';
+		baseline: 'RoassalExporters';
+		repository: 'github://pharo-graphics/RoassalExporters:v1.01';
 		lock;
 		onConflictUseLoaded.
+		
 	[
 	Metacello new
-		baseline: 'Roassal3';
-		repository: 'github://ObjectProfile/Roassal3:v1.03';
+		baseline: 'Roassal';
+		repository: 'github://pharo-graphics/Roassal:b508334';
 		lock;
 		load: #Full ]
 		on: MCMergeOrLoadWarning
 		do: [ :warning | warning load ].
+		
+	layouts load.
 	exporters load
 ]