diff --git a/data.json b/data.json
index 85eb99d..c9466b0 100644
--- a/data.json
+++ b/data.json
@@ -9,6 +9,15 @@
 	"cmd": {
 		"shutdown": ["sudo shutdown now"]
 	},
+	"scripts": {
+		"run": "run.sh",
+		"exec": "exec.sh"
+	},
+	"file_extensions": {
+		"scripts": [
+			".sh"
+		]
+	},
 	"adamocomp": {
 		"repo": "sys/adamocomp.git",
 		"issue_path": "$ADAMOCOMP_HOME",
@@ -29,38 +38,14 @@
 	},
 	"charybdis": {
 		"repo": "sys/charybdis.git",
-		"docker": {
-			"issue_path": "/opt/charybdis",
-			"image": "vanityshed/charybdis",
-			"options": [
-				[
-					"--rm"
-				],
-				[
-					"--volume",
-					"/opt/charybdis:/irc/etc"
-		  		],
-		  		[
-		  			"--publish",
-					"5000:5000",
-					"6665:6665",
-					"6666:6666",
-		  			"6667:6667",
-		  			"6668:6668",
-		  			"6669:6669",
-		  			"6697:6697",
-		  			"172.17.0.2:9999:9999"
-		  		],
-		  		["--restart","always"],
-		  		["--hostname","b5vr.adamo.network"]
-			]
-		},
+		"workdir": "/opt/charybdis",
 		"suggest": [
 			"Mounting problem?"
 		]
 	},
 	"gitlab": {
 		"repo": "services/docker-gitlab.git",
+		"workdir": "/opt/gitlab",
 		"scripts": {
 			"run": "docker/run.sh",
 			"backup": "backup/cycle.sh"
@@ -70,47 +55,13 @@
 		]
 	},
 	"gitlab-runner": {
-		"repo": "sys/gitlab-runner.git",
-		"docker": {
-			"issue_path": "/opt/gitlab-runner",
-			"image": "gitlab/gitlab-runner:latest",
-			"options": [
-				[
-					"--rm"
-				],
-				[
-					"--volume",
-					"/srv/gitlab-runner/config:/etc/gitlab-runner",
-					"/var/run/docker.sock:/var/run/docker.sock"
-		  		],
-		  		["--restart","always"]
-			]
-		},
+		"repo": "services/docker-gitlab-runner.git",
 		"suggest": [
 			"Can't reach the volumes?"
 		]
 	},
 	"archivebox": {
-		"repo": "apps/archivebox.git",
-		"docker": {
-			"image": "archivebox/archivebox",
-			"options": [
-				[
-					"--publish",
-					"8000:8000"
-				],
-				[	
-					"--env",
-					"USE_COLOR=True",
-					"SHOW_PROGRESS=False"
-				],
-				[
-					"-v",
-					"$PWD:/data"
-				],
-				["--restart","always"]
-			]
-		}
+		"repo": "services/docker-archivebox.git",
 	},
     "asciiflow": {
     	"repo": "apps/asciiflow.git",