diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 3cd378ce32..28b8627cec 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -2,8 +2,11 @@ FROM rhel7
 MAINTAINER jlabocki@redhat.com
 
 #Install required packages
-RUN yum install -y wget procps-ng net-tools && yum clean all
-RUN yum install -y openstack-keystone openstack-utils openstack-selinux && yum clean all
+RUN yum install -y openstack-keystone \
+	openstack-utils \
+	openstack-selinux \
+	mariadb \
+	&& yum clean all
 
 ADD ./start.sh /start.sh
 
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index 2fcb91317b..fa0f14c0bb 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -7,7 +7,14 @@ if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then
 	KEYSTONE_ADMIN_TOKEN=$(openssl -hex 15)
 fi
 
-/usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password ${KEYSTONE_DB_PASSWORD}
+# This is a terrible, terrible idea.
+#/usr/bin/openstack-db --service keystone --init --yes --rootpw ${DB_ROOT_PASSWORD} --password ${KEYSTONE_DB_PASSWORD}
+
+mysql -u root -p${DB_ROOT_PASSWORD} mysql <<EOF
+CREATE DATABASE IF NOT EXISTS keystone;
+GRANT ALL PRIVILEGES ON keystone.* TO
+	'keystone'@'%' IDENTIFIED BY '${KEYSTONE_DB_PASSWORD}'
+EOF
 
 crudini --set /etc/keystone/keystone.conf \
 	database \