diff --git a/templates/etc/mysql/my.cnf.j2 b/templates/etc/mysql/my.cnf.j2
index 18274f6..c47358f 100644
--- a/templates/etc/mysql/my.cnf.j2
+++ b/templates/etc/mysql/my.cnf.j2
@@ -26,7 +26,9 @@ log-error = {{ mysql_log_error }}
 
 {% if mysql_slow_query_log_enabled %}
 # Slow query log configuration.
+{% if mysql_vendor != 'mariadb' or mysql_mariadb_version | version_compare('10.0', '<') %}
 log_slow_queries = 1
+{% endif %}
 slow_query_log = 1
 slow_query_log_file = {{ mysql_slow_query_log_file }}
 long_query_time = {{ mysql_slow_query_time }}
@@ -61,7 +63,7 @@ thread_concurrency = {{ mysql_thread_concurrency }}
 # InnoDB settings.
 innodb_file_per_table = {{ mysql_innodb_file_per_table }}
 innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }}
-{% if mysql_innodb_additional_mem_pool_size is defined %}
+{% if mysql_vendor != 'mariadb' or mysql_mariadb_version | version_compare('10.0', '<') %}
 innodb_additional_mem_pool_size = {{ mysql_innodb_additional_mem_pool_size }}
 {% endif %}
 #innodb_log_file_size = {{ mysql_innodb_log_file_size }}