diff --git a/hooks/percona_hooks.py b/hooks/percona_hooks.py
index 86b2745..fb90a43 100755
--- a/hooks/percona_hooks.py
+++ b/hooks/percona_hooks.py
@@ -114,6 +114,11 @@ def render_config(clustered=False, hosts=[]):
     if not os.path.exists(os.path.dirname(MY_CNF)):
         os.makedirs(os.path.dirname(MY_CNF))
 
+    if lsb_release()['DISTRIB_CODENAME'] < 'vivid':
+        data_dir = '/var/lib/mysql'
+    else:
+        data_dir = '/var/lib/percona'
+
     context = {
         'cluster_name': 'juju_cluster',
         'private_address': get_host_ip(),
@@ -123,7 +128,8 @@ def render_config(clustered=False, hosts=[]):
         'sst_password': config('sst-password'),
         'innodb_file_per_table': config('innodb-file-per-table'),
         'table_open_cache': config('table-open-cache'),
-        'lp1366997_workaround': config('lp1366997-workaround')
+        'lp1366997_workaround': config('lp1366997-workaround'),
+        'data_dir': data_dir,
     }
 
     if config('prefer-ipv6'):
diff --git a/templates/my.cnf b/templates/my.cnf
index c3b59c5..c3c7afc 100644
--- a/templates/my.cnf
+++ b/templates/my.cnf
@@ -9,7 +9,7 @@ bind-address = {{ bind_address }}
 wsrep_provider_options = {{ wsrep_provider_options }}
 {% endif %}
 
-datadir=/var/lib/mysql
+datadir={{ data_dir }}
 user=mysql
 pid_file = /var/run/mysqld/mysqld.pid