diff --git a/salt/fleet/init.sls b/salt/fleet/init.sls
new file mode 100644
index 000000000..abb1828c8
--- /dev/null
+++ b/salt/fleet/init.sls
@@ -0,0 +1,7 @@
+# Fleet Setup
+fleetcdir:
+  file.directory:
+    - name: /opt/so/conf/fleet/etc
+    - user: 939
+    - group: 939
+    - makedirs: True
diff --git a/salt/mysql/etc/my.cnf b/salt/mysql/etc/my.cnf
new file mode 100644
index 000000000..bbcee564d
--- /dev/null
+++ b/salt/mysql/etc/my.cnf
@@ -0,0 +1,31 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.7/en/server-configuration-defaults.html
+
+[mysqld]
+#
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+# innodb_buffer_pool_size = 128M
+#
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+# log_bin
+#
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+skip-host-cache
+skip-name-resolve
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+secure-file-priv=/var/lib/mysql-files
+user=mysql
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid
diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
new file mode 100644
index 000000000..1c8464167
--- /dev/null
+++ b/salt/mysql/init.sls
@@ -0,0 +1,7 @@
+# MySQL Setup
+filebeatetcdir:
+  file.directory:
+    - name: /opt/so/conf/mysql/etc
+    - user: 939
+    - group: 939
+    - makedirs: True
diff --git a/so-setup-network.sh b/so-setup-network.sh
index c5fa17504..d7c6e8891 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -1451,8 +1451,8 @@ if (whiptail_you_sure); then
     get_filesystem_nsm
     copy_ssh_key
     set_initial_firewall_policy
-    sensor_pillar
     create_bond
+    sensor_pillar
     saltify
     docker_install
     configure_minion SENSOR