diff --git a/roles/synapse/tasks/main.json b/roles/synapse/tasks/main.json
index 0450ca2..002c6f2 100644
--- a/roles/synapse/tasks/main.json
+++ b/roles/synapse/tasks/main.json
@@ -1,21 +1,40 @@
 [
 	{
-		"name": "invoke required repositories",
+		"name": "preparation | install packages",
 		"become": true,
-		"ansible.builtin.copy": {
-			"src": "sources-bullseye-backports.list",
-			"dest": "/etc/apt/sources.list.d/bullseye-backports-for-synapse.list"
+		"ansible.builtin.apt": {
+			"update_cache": true,
+			"pkg": [
+				"lsb-release",
+				"apt-transport-https"
+			]
 		}
 	},
 	{
-		"name": "update sources",
+		"name": "preparation | get keyring",
+		"become": true,
+		"ansible.builtin.get_url": {
+			"url": "https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg",
+			"dest": "/usr/share/keyrings/matrix-org-archive-keyring.gpg"
+		}
+	},
+	{
+		"name": "preparation | add source",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "echo \"deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main\" > /etc/apt/sources.list.d/synapse.list",
+			"creates": "/etc/apt/sources.list.d/synapse.list"
+		}
+	},
+	{
+		"name": "preparation | update package information",
 		"become": true,
 		"ansible.builtin.apt": {
 			"update_cache": true
 		}
 	},
 	{
-		"name": "prepare package installation | server-name",
+		"name": "preparation | conf | server-name",
 		"become": true,
 		"ansible.builtin.debconf": {
 			"name": "matrix-synapse",
@@ -25,7 +44,7 @@
 		}
 	},
 	{
-		"name": "prepare package installation | report-stats",
+		"name": "preparation | conf | report-stats",
 		"become": true,
 		"ansible.builtin.debconf": {
 			"name": "matrix-synapse",
@@ -41,7 +60,7 @@
 			"update_cache": true,
 			"pkg": [
 				"python3-authlib",
-				"matrix-synapse"
+				"matrix-synapse-py3"
 			]
 		}
 	},
@@ -94,10 +113,10 @@
 	},
 	{
 		"name": "setup admin user",
+		"when": "var_synapse_admin_user_define",
 		"become": true,
 		"ansible.builtin.shell": {
 			"cmd": "synapse_register_new_matrix_user --config=/etc/matrix-synapse/homeserver.yaml --admin --user={{var_synapse_admin_user_name}} --password={{var_synapse_admin_user_password}} || true"
-		},
-		"when": "var_synapse_admin_user_define"
+		}
 	}
 ]