diff --git a/playbooks/aur-dev.archlinux.org.yml b/playbooks/aur-dev.archlinux.org.yml
index b8ce7befc4da8cebf1e7c80b254dddfd04d749c5..968ca0aec96e76337c18c858f2ca7a881d6c98d4 100644
--- a/playbooks/aur-dev.archlinux.org.yml
+++ b/playbooks/aur-dev.archlinux.org.yml
@@ -10,7 +10,7 @@
     - { role: root_ssh }
     - { role: certbot }
     - { role: nginx }
-    - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+    - { role: mariadb }
     - { role: sudo }
     - { role: php_fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
     - { role: memcached }
diff --git a/playbooks/aur.archlinux.org.yml b/playbooks/aur.archlinux.org.yml
index bcac512493986714e3d9ecb61fb4a3afce539ebd..804297b146537ca9419496f8ba1ab4604dedb318 100644
--- a/playbooks/aur.archlinux.org.yml
+++ b/playbooks/aur.archlinux.org.yml
@@ -12,7 +12,7 @@
     - { role: promtail }
     - { role: certbot }
     - { role: nginx }
-    - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true, mariadb_innodb_buffer_pool_size: '1G' }
+    - { role: mariadb, mariadb_innodb_buffer_pool_size: '1G' }
     - { role: sudo }
     - { role: php_fpm, php_extensions: ['iconv', 'memcached', 'mysqli', 'pdo_mysql'], zend_extensions: ['opcache'] }
     - { role: memcached }
diff --git a/playbooks/bbs.archlinux.org.yml b/playbooks/bbs.archlinux.org.yml
index a33071752bea48a7e3c6ebf9b4a8bd60d5b403c9..c345169e0a4fc4c50ffbe9698a9dee8ad5f6dadd 100644
--- a/playbooks/bbs.archlinux.org.yml
+++ b/playbooks/bbs.archlinux.org.yml
@@ -10,7 +10,7 @@
     - { role: root_ssh }
     - { role: certbot }
     - { role: nginx }
-    - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+    - { role: mariadb }
     - { role: sudo }
     - { role: php_fpm, php_extensions: ['apcu', 'iconv', 'intl', 'mysqli'], zend_extensions: ['opcache'] }
     - { role: fluxbb }
diff --git a/playbooks/bugs.archlinux.org.yml b/playbooks/bugs.archlinux.org.yml
index fc82b29b75b692c74d4f852d809f6e607bc54d01..faa377abdfc99566583551693ca043eb0b4d6737 100644
--- a/playbooks/bugs.archlinux.org.yml
+++ b/playbooks/bugs.archlinux.org.yml
@@ -10,7 +10,7 @@
     - { role: root_ssh }
     - { role: certbot }
     - { role: nginx }
-    - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+    - { role: mariadb }
     - { role: sudo }
     - { role: php7_fpm, php_extensions: ['mysqli'], zend_extensions: ['opcache'] }
     - { role: flyspray }
diff --git a/playbooks/wiki.archlinux.org.yml b/playbooks/wiki.archlinux.org.yml
index 00ac565e9d0bafead638779a2a620e4f2541fefd..543d3f2d0691c463719f9a297358fc38b5e27e43 100644
--- a/playbooks/wiki.archlinux.org.yml
+++ b/playbooks/wiki.archlinux.org.yml
@@ -14,7 +14,7 @@
     - { role: certbot }
     - { role: nginx }
     - { role: postfix_null }
-    - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
+    - { role: mariadb }
     - { role: sudo }
     - { role: php7_fpm, php_extensions: ['bcmath', 'curl', 'gd', 'iconv', 'intl', 'mysqli', 'sockets', 'zip'], zend_extensions: ['opcache'] }
     - { role: memcached }
diff --git a/roles/mariadb/defaults/main.yml b/roles/mariadb/defaults/main.yml
index f77b810ca7150fa5bf3826a63b6878db97d513e9..2568778d91d09881e3523fc665ecb4f72e931ed6 100644
--- a/roles/mariadb/defaults/main.yml
+++ b/roles/mariadb/defaults/main.yml
@@ -9,7 +9,7 @@ mariadb_net_buffer_length: '8K'
 mariadb_read_buffer_size: '256K'
 mariadb_read_rnd_buffer_size: '512K'
 mariadb_myisam_sort_buffer_size: '8M'
-mariadb_query_cache_type: '1'
+mariadb_query_cache_type: '0'
 mariadb_query_cache_limit: '16M'
 mariadb_query_cache_size: '32M'
 mariadb_max_connections: '400'
@@ -22,7 +22,7 @@ mariadb_innodb_log_buffer_size: '16M'
 mariadb_innodb_flush_log_at_trx_commit: '1'
 mariadb_innodb_stats_sample_pages: '32'
 mariadb_innodb_thread_concurrency: '8'
-mariadb_innodb_file_per_table: false
+mariadb_innodb_file_per_table: true
 
 mysql_backup_dir: '/root/backup-mysql'
 mysql_backup_defaults: '/root/.backup-my.cnf'