diff --git a/glance/server.sls b/glance/server.sls
index 75d240b..72d92a0 100644
--- a/glance/server.sls
+++ b/glance/server.sls
@@ -78,14 +78,13 @@
   - require:
     - service: glance_services
 
-/srv/glance:
+/var/lib/glance/images:
   file.directory:
-  - user: root
-  - group: root
   - mode: 755
-  - makedirs: true
+  - user: glance
+  - group: glance
   - require:
-    - cmd: glance_install_database
+    - pkg: glance_packages
 
 {%- for image in server.get('images', []) %}