diff --git a/elements/centos-mysql-guest-image/install.d/30-mysql b/elements/centos-mysql-guest-image/install.d/30-mysql
index 4edf969..47f0f2b 100755
--- a/elements/centos-mysql-guest-image/install.d/30-mysql
+++ b/elements/centos-mysql-guest-image/install.d/30-mysql
@@ -9,7 +9,11 @@ set -o xtrace
 wget http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm
 rpm -ivh mysql-community-release-el7-5.noarch.rpm
 
+set +e
+yum -y erase mariadb-libs mariadb-config
 yum -y install mysql-server
+yum -y install openstack-trove-guestagent
+set -e
 sudo mkdir -p /etc/mysql/conf.d/
 sudo chown mysql:mysql -R /etc/mysql
 #mkdir /etc/mysql
diff --git a/elements/trove-guest/install.d/15-install-from-repo b/elements/trove-guest/install.d/15-install-from-repo
index 260d815..7c776e6 100755
--- a/elements/trove-guest/install.d/15-install-from-repo
+++ b/elements/trove-guest/install.d/15-install-from-repo
@@ -13,7 +13,9 @@ if [ "${DISTRO}" = "rhel" ]; then
 fi
 
 if [ "${DISTRO}" = "centos" ]; then
-    yum -y install https://rdo.fedorapeople.org/rdo-release.rpm
+    yum -y install wget
+    rpm -q rdo-release || install-packages http://rdo.fedorapeople.org/openstack-$RDO_RELEASE/rdo-release-$RDO_RELEASE.rpm
+    #yum -y install https://rdo.fedorapeople.org/rdo-release.rpm
 #    sed -i 's/http:\/\/repos.fedorapeople.org\/repos\/openstack\/openstack-juno\/epel-Derived\ from\ Red\ Hat\ Enterprise\ Linux\ 7.1\ (Source)\//http:\/\/repos.fedorapeople.org\/repos\/openstack\/openstack-kilo\/el7\//g' /etc/yum.repos.d/rdo-release.repo
     yum -y update
     sed -i -e 's/^Defaults.*requiretty/# Defaults requiretty/g' /etc/sudoers
diff --git a/elements/trove-guest/openstack-trove-guestagent.service b/elements/trove-guest/openstack-trove-guestagent.service
index 8989da1..8c85dd7 100755
--- a/elements/trove-guest/openstack-trove-guestagent.service
+++ b/elements/trove-guest/openstack-trove-guestagent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target cloud-init.service
 [Service]
 Type=simple
 User=trove
-ExecStart=/usr/bin/trove-guestagent --config-file /etc/trove/trove-guestagent.conf --config-file /etc/guest_info --log-dir=/var/log/trove --logfile=trove-guestagent.log
+ExecStart=/usr/bin/trove-guestagent --config-file /etc/trove/trove-guestagent.conf --config-file /etc/guest_info --config-file /etc/trove/conf.d/guest_info.conf --config-file /etc/trove/conf.d/trove-guestagent.conf --log-dir=/var/log/trove --logfile=trove-guestagent.log
 Restart=on-failure
 
 [Install]
diff --git a/elements/trove-guest/post-install.d/30-register-guest-service b/elements/trove-guest/post-install.d/30-register-guest-service
index 754f8ad..52aad25 100755
--- a/elements/trove-guest/post-install.d/30-register-guest-service
+++ b/elements/trove-guest/post-install.d/30-register-guest-service
@@ -14,6 +14,10 @@ if [ "${DISTRO}" != "ubuntu" ]; then
     sudo mv /etc/trove/guest_info /etc/guest_info
     sudo chmod 0755 /etc/guest_info
     chown trove:trove /etc/guest_info
+    mkdir -p /etc/trove/conf.d
+    sudo cp /etc/guest_info /etc/trove/conf.d/guest_info.conf
+    echo '[DEFAULT]' > /etc/trove/conf.d/trove-guestagent.conf
+    chown -R trove:trove /etc/trove/conf.d
     # Enable and start service
     systemctl enable openstack-trove-guestagent.service
     systemctl start openstack-trove-guestagent.service
diff --git a/elements/trove-mysql-guest-configuration/post-install.d/63-mysql b/elements/trove-mysql-guest-configuration/post-install.d/63-mysql
index fdb5ac2..001918b 100755
--- a/elements/trove-mysql-guest-configuration/post-install.d/63-mysql
+++ b/elements/trove-mysql-guest-configuration/post-install.d/63-mysql
@@ -88,7 +88,7 @@ swift_service_type = $DIB_TROVE_SWIFT_SERVICE_TYPE
 # ========== Datastore Manager Configurations ==========
 # Datastore manager implementations.
 # Format: list of 'datastore-type:datastore.manager.implementation.module'
-# datastore_registry_ext = mysql:trove.guestagent.datastore.mysql.manager.Manager, percona:trove.guestagent.datastore.mysql.manager.Manager
+datastore_registry_ext = mysql:trove.guestagent.datastore.mysql.manager.Manager, percona:trove.guestagent.datastore.mysql.manager.Manager
 
 
 # ========== Default Users / DBs Configuration ==========
@@ -155,4 +155,4 @@ replication_namespace = trove.guestagent.strategies.replication.mysql_gtid
 # replication_user = slave_user
 # replication_password = slave_password
 
-EOF
\ No newline at end of file
+EOF