diff --git a/bootstrap/playbooks/riak.yaml b/bootstrap/playbooks/riak.yaml
index 2a484b5b..c6f0b00e 100644
--- a/bootstrap/playbooks/riak.yaml
+++ b/bootstrap/playbooks/riak.yaml
@@ -1,9 +1,11 @@
+- file: path=/var/tmp/vagrant state=directory
+- copy: src=/vagrant/utils/riak/app.config dest=/var/tmp/vagrant/riak-app.config
 - name: start riak container
   docker:
     name: vagrant_riak_1
     image: solarproject/riak
     volumes:
-        - /vagrant/utils/riak/app.config:/etc/riak/app.config
+      - /var/tmp/vagrant/riak-app.config:/etc/riak/app.config
     ports:
       - 8087:8087
       - 8098:8098
diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index 7906f62a..bc91f7cc 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -36,7 +36,7 @@ Just update resource::
 How can I run solar worker ?
 -----------------------------------
 
-- If you use `vagrant` then you can just `sudo start solar-worker` 
+- If you use `vagrant` then you can just `sudo start solar-worker`
   as `vagrant` user.
 
 How can I configure solar ?
@@ -45,10 +45,10 @@ How can I configure solar ?
 There are several places where we search for config values:
 
 1. `.config` file in CWD or in path from `SOLAR_CONFIG` env variable
-2. if env `SOLAR_CONFIG_OVERRIDE` contains valid path then it override 
+2. if env `SOLAR_CONFIG_OVERRIDE` contains valid path then it override
    previous values
 3. `.config.override` in CWD
-4. You can also set upper-cased env variable which matches one of those in 
+4. You can also set upper-cased env variable which matches one of those in
    config
 
 .. _faq_what_database: