diff --git a/roles/tandoor/tasks/main.json b/roles/tandoor/tasks/main.json
index b05ccf0..14e48f7 100644
--- a/roles/tandoor/tasks/main.json
+++ b/roles/tandoor/tasks/main.json
@@ -55,39 +55,20 @@
 		}
 	},
 	{
-		"name": "database",
+		"name": "initialize",
 		"become": true,
 		"become_user": "{{var_tandoor_user}}",
 		"environment": {
 			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program",
 		},
+		"loop": [
+			"migrate",
+			"collectstatic --no-input",
+			"collectstatic_js_reverse"
+		],
 		"ansible.builtin.shell": {
 			"chdir": "{{var_tandoor_directory}}/program",
-			"cmd": "bin/python3 manage.py migrate"
-		}
-	},
-	{
-		"name": "static files",
-		"become": true,
-		"become_user": "{{var_tandoor_user}}",
-		"environment": {
-			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program",
-		},
-		"ansible.builtin.shell": {
-			"chdir": "{{var_tandoor_directory}}/program",
-			"cmd": "bin/python3 manage.py collectstatic --no-input"
-		}
-	},
-	{
-		"name": "static files",
-		"become": true,
-		"become_user": "{{var_tandoor_user}}",
-		"environment": {
-			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program",
-		},
-		"ansible.builtin.shell": {
-			"chdir": "{{var_tandoor_directory}}/program",
-			"cmd": "bin/python3 manage.py collectstatic_js_reverse"
+			"cmd": "bin/python3 manage.py {{item}}"
 		}
 	},
 	{
@@ -96,7 +77,7 @@
 		"become_user": "{{var_tandoor_user}}",
 		"ansible.builtin.shell": {
 			"chdir": "{{var_tandoor_directory}}/program/vue",
-			"cmd": "yarn install && yarn build"
+			"cmd": "yarnpkg install && yarnpkg build"
 		}
 	},
 	{