diff --git a/roles/tandoor/tasks/main.json b/roles/tandoor/tasks/main.json
index 99d7a64..08aa5fd 100644
--- a/roles/tandoor/tasks/main.json
+++ b/roles/tandoor/tasks/main.json
@@ -58,8 +58,10 @@
 		"name": "database",
 		"become": true,
 		"become_user": "{{var_tandoor_user}}",
+		"environment": {
+			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program",
+		},
 		"ansible.builtin.shell": {
-			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
 			"cmd": "bin/python3 manage.py migrate"
 		}
 	},
@@ -67,8 +69,10 @@
 		"name": "static files",
 		"become": true,
 		"become_user": "{{var_tandoor_user}}",
+		"environment": {
+			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program",
+		},
 		"ansible.builtin.shell": {
-			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
 			"cmd": "bin/python3 manage.py collectstatic --no-input"
 		}
 	},
@@ -76,8 +80,10 @@
 		"name": "static files",
 		"become": true,
 		"become_user": "{{var_tandoor_user}}",
+		"environment": {
+			"VIRTUAL_ENV": "{{var_tandoor_directory}}/program",
+		},
 		"ansible.builtin.shell": {
-			"environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
 			"cmd": "bin/python3 manage.py collectstatic_js_reverse"
 		}
 	},