diff --git a/galera/_ssl.sls b/galera/_ssl.sls
index 2daf44a..e6ddd42 100644
--- a/galera/_ssl.sls
+++ b/galera/_ssl.sls
@@ -6,6 +6,15 @@
 {%- endif %}
 
 {%- if service.get('ssl', {}).get('enabled', False) %}
+
+galera_ssl_dir:
+  file.directory:
+  - name: /etc/mysql/ssl
+  - makedirs: true
+  - mode: 755
+  - require:
+    - pkg: galera_packages
+
 {%- if service.ssl.cacert_chain is defined %}
 mysql_cacertificate:
   file.managed:
@@ -27,6 +36,7 @@
   - create: False
   - require:
     - file: mysql_cacertificate_exists
+    - file: galera_ssl_dir
   - require_in:
     - service: galera_service
     - file: galera_config
@@ -53,6 +63,7 @@
     - create: False
     - require:
       - file: mysql_certificate_exists
+      - file: galera_ssl_dir
     - require_in:
       - service: galera_service
       - file: galera_config
@@ -69,6 +80,7 @@
     - makedirs: true
     - require:
       - pkg: galera_packages
+      - file: galera_ssl_dir
     - require_in:
       - service: galera_service
       - file: galera_config
@@ -86,6 +98,7 @@
     - require:
       - file: mysql_server_key_exists
       - pkg: galera_packages
+      - file: galera_ssl_dir
     - require_in:
        - service: galera_service
        - file: galera_config
diff --git a/galera/master.sls b/galera/master.sls
index 28c211e..871124d 100644
--- a/galera/master.sls
+++ b/galera/master.sls
@@ -32,9 +32,9 @@
   - refresh: true
   - force_yes: True
 
-galera_log_dir:
+galera_dirs:
   file.directory:
-  - name: /var/log/mysql
+  - names: ['/var/log/mysql', '/etc/mysql']
   - makedirs: true
   - mode: 755
   - require:
diff --git a/galera/slave.sls b/galera/slave.sls
index 92bf324..6d9f0d3 100644
--- a/galera/slave.sls
+++ b/galera/slave.sls
@@ -32,9 +32,9 @@
   - refresh: true
   - force_yes: True
 
-galera_log_dir:
+galera_dirs:
   file.directory:
-  - name: /var/log/mysql
+  - names: ['/var/log/mysql', '/etc/mysql']
   - makedirs: true
   - mode: 755
   - require: