diff --git a/util/ansible/deploy.yml b/util/ansible/deploy.yml
index a9dea389f..4d26380e4 100644
--- a/util/ansible/deploy.yml
+++ b/util/ansible/deploy.yml
@@ -2,17 +2,20 @@
 - hosts: all
   become: true
   vars:
-    util_base: "{{ playbook_dir | dirname }}"
-    www_base: "{{ util_base | dirname }}"
-    app_base: "{{ www_base | dirname }}"
-    tmp_base: "{{ app_base }}/www_tmp"
-    app_env: "production"
-    update_mode: false
+    util_base : "{{ playbook_dir | dirname }}"
+    www_base : "{{ util_base | dirname }}"
+    app_base : "{{ www_base | dirname }}"
+    tmp_base : "{{ app_base }}/www_tmp"
+    app_env : "production"
+    update_mode : false
 
-    dev_azuracast_user_password: "azuracast"
-    dev_mysql_user_password: "azuracast"
+    dev_azuracast_user_password : "azuracast"
+    dev_mysql_user_password : "azuracast"
 
-  roles:
+  environment :
+    DEBIAN_FRONTEND : noninteractive
+
+  roles :
     - init
     - azuracast-user
     - azuracast-config
diff --git a/util/ansible/roles/mariadb/tasks/main.yml b/util/ansible/roles/mariadb/tasks/main.yml
index 7775f4b04..77243fdf9 100644
--- a/util/ansible/roles/mariadb/tasks/main.yml
+++ b/util/ansible/roles/mariadb/tasks/main.yml
@@ -2,10 +2,6 @@
 - name : Update MariaDB Dependencies
   shell : curl -sSL https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | bash -s -- --mariadb-server-version="mariadb-10.5"
 
-- name : Unattended package installation
-  shell : export DEBIAN_FRONTEND=noninteractive
-  changed_when : false
-
 - name : Install MariaDB
   apt :
     name : "{{ packages }}"
diff --git a/util/ansible/update.yml b/util/ansible/update.yml
index a6c3dc1a8..38f4efd92 100644
--- a/util/ansible/update.yml
+++ b/util/ansible/update.yml
@@ -10,6 +10,9 @@
     update_mode : true
     update_revision : 1
 
+  environment :
+    DEBIAN_FRONTEND : noninteractive
+
   roles :
     - init
     - azuracast-config