diff --git a/data.json b/data.json
index 982c28a..e8fa0df 100644
--- a/data.json
+++ b/data.json
@@ -60,7 +60,7 @@
 		]
 	},
 	"gitlab": {
-		"repo": "GITLABREPO.git",
+		"repo": "services/gitlab.git",
 		"docker": {
 			"issue_path": "/opt/gitlab",
 			"image": "gitlab/gitlab-ce:latest",
@@ -287,114 +287,138 @@
 				}
 			}
 		},
-		"internum": {
+		"ocean": {
 			"clusterio": {
 				"integer": {
 					"remote": {
-						"host": "internum.adamo",
+						"host": "ocean.adamo.link",
 						"ports": {
 							"factorio": 50002
 						}
 					},
-					"local": {
-						"host": "factorarium.internum.adamo",
-						"ports": {
-							"ssh": 22,
-							"factorio": 1000
-						}
-					}
 				},
 				"vacatium": {
-					"host": "integer.internum.adamo",
 					"remote": {
-						"host": "internum.adamo",
+						"host": "ocean.adamo.link",
 						"ports": {
 							"factorio": 50003
 						}
-					},
-					"local": {
-						"host": "factorarium.internum.adamo",
-						"ports": {
-							"ssh": 22,
-							"factorio": 1000
-						}
 					}
 				}
 			},
 			"austr": {
 				"remote": {
-					"host": "internum.adamo",
+					"host": "ocean.adamo.link",
 					"ports": {
 						"ssh": 22150,
 						"resilio-sync-panel": 40000
 					}
 				},
 				"local": {
-					"host": "austr.internum.adamo",
-					"ipv4": "192.168.6.150"
+					"host": "austr.adamo.host",
+					"ipv4": "192.168.1.150"
 				}
 			},
 			"sicilia": {
-				"syracusae": {
+				"remote": {
+					"host": "sicilia.adamo.host",
+					"ports": {
+						"ssh": 22,
+						"http": 8100,
+						"https": 44100
+					}
+				},
+				"local": {
+					"host": "ocean.adamo.link",
+					"ipv4": "192.168.1.100"
+				},
+				"melita": {
 					"remote": {
-						"host": "internum.adamo",
+						"host": "melita.adamo.host",
 						"ports": {
 							"ssh": 22010,
 							"http": 8010
 						}
 					},
 					"local": {
-						"host": "syracusae.internum.adamo",
-						"ipv4": "192.168.6.10"
+						"host": "ocean.adamo.link",
+						"ipv4": "192.168.1.10"
 					}
 				},
-				"melita": {
+				"tools": {
 					"remote": {
-						"host": "internum.adamo",
+						"host": "melita.adamo.host",
 						"ports": {
 							"ssh": 22020
 						}
 					},
 					"local": {
-						"ipv4": "192.168.6.20",
-						"host": "melita.internum.adamo"
+						"ipv4": "192.168.1.20",
+						"host": "ocean.adamo.link"
+					}
+				},
+				"gitlab": {
+					"remote": {
+						"host": "ocean.adamo.link",
+						"ports": {
+							"ssh": 22021,
+							"http": 45080,
+							"https": 45443
+						}
+					},
+					"local": {
+						"host": "syracusae.adamo.host",
+						"ipv4": "192.168.1.21"
+					}
+				},
+				"data": {
+					"remote": {
+						"host": "ocean.adamo.link",
+						"ports": {
+							"ssh": 22022
+						}
+					},
+					"local": {
+						"ipv4": "192.168.1.22",
+						"host": "data.adamo.host"
+					}
+				},
+				"comms": {
+					"remote": {
+						"host": "ocean.adamo.link",
+						"ports": {
+							"ssh": 22023
+						},
+						"user": "rancher"
+					},
+					"local": {
+						"ipv4": "192.168.1.23",
+						"host": "comms.adamo.host"
+					}
+				},
+				"services": {
+					"remote": {
+						"host": "ocean.adamo.link",
+						"ports": {
+							"ssh": 22024
+						},
+						"user": "rancher"
+					},
+					"local": {
+						"ipv4": "192.168.1.24",
+						"host": "services.adamo.host"
 					}
 				},
 				"factorarium": {
 					"remote": {
-						"host": "internum.adamo",
+						"host": "ocean.adamo.link",
 						"ports": {
 							"ssh": 22101
 						}
 					},
 					"local": {
-						"ipv4": "192.168.6.101",
-						"host": "factorarium.internum.adamo"
-					}
-				},
-				"dockerpad": {
-					"remote": {
-						"host": "internum.adamo",
-						"ports": {
-							"ssh": 22102
-						}
-					},
-					"local": {
-						"ipv4": "192.168.6.102",
-						"host": "dockerpad.internum.adamo"
-					}
-				},
-				"acragas": {
-					"remote": {
-						"host": "internum.adamo",
-						"ports": {
-							"ssh": 22104
-						},
-						"user": "rancher"
-					},
-					"local": {
-						"ipv4": "192.168.6.104",
-						"host": "acragas.internum.adamo"
+						"ipv4": "192.168.1.101",
+						"host": "factorarium.adamo.host"
 					}
 				}
 			}