diff --git a/files/osbs-buildroot-Dockerfile b/files/osbs/buildroot-Dockerfile
similarity index 100%
rename from files/osbs-buildroot-Dockerfile
rename to files/osbs/buildroot-Dockerfile
diff --git a/files/osbs/docker-storage b/files/osbs/docker-storage
new file mode 100644
index 0000000000..3c888d2837
--- /dev/null
+++ b/files/osbs/docker-storage
@@ -0,0 +1 @@
+DOCKER_STORAGE_OPTIONS="--storage-driver=devicemapper --storage-opt dm.datadev=/dev/vg-docker/data --storage-opt dm.metadatadev=/dev/vg-docker/metadata"
\ No newline at end of file
diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml
index aea84f39bc..aec8f9c744 100644
--- a/playbooks/groups/osbs-master.yml
+++ b/playbooks/groups/osbs-master.yml
@@ -251,6 +251,18 @@
         dest: "{{ koji_ca_cert_path }}"
       notify: oc secrets new
 
+    - name: setup logical volume for docker cache
+      lvol:
+        vg: "vg-docker"
+        lv: "metadata"
+        size: "4g"
+
+    - name: setup logical volume for docker data storage
+      lvol:
+        vg: "vg-docker"
+        lv: "data"
+        size: "55g"
+
     - name: install docker
       action: "{{ ansible_pkg_mgr }} name=docker state=installed"
 
@@ -269,6 +281,11 @@
         src: "{{private}}/files/koji/containerbuild.key.pem"
         dest: "{{docker_cert_dir}}/client.key"
 
+    - name: copy docker storage config
+      copy:
+        src: "{{files}}/osbs/docker-storage"
+        dest: "/etc/sysconfig/docker-storage"
+
     - name: start and enable docker
       service: name=docker state=started enabled=yes
 
@@ -301,7 +318,7 @@
 
     - name: Upload Dockerfile for buildroot container
       copy:
-        src: "{{ files }}/osbs-buildroot-Dockerfile"
+        src: "{{ files }}/osbs/buildroot-Dockerfile"
         dest: "/etc/osbs/buildroot/Dockerfile"
         mode: 0400
       notify:
diff --git a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml
index 15cf599c57..179c31a613 100644
--- a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml
@@ -262,7 +262,7 @@
 
     - name: Upload Dockerfile for buildroot container
       copy:
-        src: "{{ files }}/osbs-buildroot-Dockerfile"
+        src: "{{ files }}/osbs/buildroot-Dockerfile"
         dest: "/etc/osbs/buildroot/Dockerfile"
         mode: 0400
       notify: