diff --git a/roles/mas/tasks/main.json b/roles/mas/tasks/main.json
index eae7805..6237403 100644
--- a/roles/mas/tasks/main.json
+++ b/roles/mas/tasks/main.json
@@ -14,7 +14,8 @@
 		"loop": [
 			"{{var_mas_directory}}/conf.d",
 			"{{var_mas_directory}}/conf.d/providers",
-			"{{var_mas_directory}}/conf.d/clients"
+			"{{var_mas_directory}}/conf.d/clients",
+			"{{var_mas_directory}}/scripts"
 		],
 		"ansible.builtin.file": {
 			"state": "directory",
@@ -47,7 +48,8 @@
 		"become": true,
 		"ansible.builtin.copy": {
 			"src": "conf-compose.py",
-			"dest": "/usr/bin/mas-conf-compose",
+			"dest": "{{var_mas_directory}}/scripts/conf-compose",
+			"owner": "{{var_mas_user}}",
 			"mode": "0700"
 		}
 	},
@@ -57,14 +59,14 @@
 		"become_user": "{{var_mas_user}}",
 		"ansible.builtin.template": {
 			"src": "config-base.json.j2",
-			"dest": "{{var_mas_directory}}/conf.d/base.yaml"
+			"dest": "{{var_mas_directory}}/conf.d/base.json"
 		}
 	},
 	{
 		"name": "configuration | apply",
 		"become": true,
 		"ansible.builtin.command": {
-			"cmd": "/usr/bin/mas-conf-compose"
+			"cmd": "/usr/local/bin/mas-conf-compose"
 		}
 	},
 	{
diff --git a/roles/mas/templates/config-base.json.j2 b/roles/mas/templates/config-base.json.j2
index f49bb37..7a6f488 100644
--- a/roles/mas/templates/config-base.json.j2
+++ b/roles/mas/templates/config-base.json.j2
@@ -28,7 +28,7 @@
 					},
 					{
 						"name": "assets"
-					},
+					}
 				],
 				"binds": [
 					{
@@ -59,7 +59,7 @@
 			"10.0.0.0/10",
 			"127.0.0.1/8",
 			"fd00::/8",
-			"::1/128",
+			"::1/128"
 		],
 		"public_base": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/",
 		"issuer": "http://{{var_mas_server_address}}]:{{var_mas_server_port | string}}/"