diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # B9 - A Benign VM-Build Tool
 
-[![Build Status](https://travis-ci.org/sheyll/b9-vm-image-builder.svg?branch=master)](https://travis-ci.org/sheyll/b9-vm-image-builder)
-
-[![Hackage](https://img.shields.io/badge/hackage-B9-green.svg?style=flat)](http://hackage.haskell.org/package/b9)
+[![Build Status](https://travis-ci.org/sheyll/b9-vm-image-builder.svg?branch=0.5)](https://travis-ci.org/sheyll/b9-vm-image-builder) [![Hackage](https://img.shields.io/badge/hackage-B9-green.svg?style=flat)](http://hackage.haskell.org/package/b9) [![b9 LTS](http://stackage.org/package/b9/badge/lts)](http://stackage.org/lts/package/b9) [![b9 LTS 6](http://stackage.org/package/b9/badge/lts-6)](http://stackage.org/lts-6/package/b9) [![b9 LTS 5](http://stackage.org/package/b9/badge/lts-5)](http://stackage.org/lts-5/package/b9)
 
 Use B9 to compile your software into a deployable set of Linux-VM- or
 configuration images, from a set of scripts and input files and templates
diff --git a/b9.cabal b/b9.cabal
--- a/b9.cabal
+++ b/b9.cabal
@@ -1,5 +1,5 @@
 name: b9
-version: 0.5.30
+version: 0.5.31
 cabal-version: >=1.22
 build-type: Simple
 license: MIT
@@ -133,7 +133,7 @@
         ghc-options: -fno-warn-amp
     main-is: Main.hs
     build-depends:
-        b9 >=0.5.30,
+        b9 >=0.5.31,
         base >=4.8 && <5,
         directory >=1.2.6.2,
         bytestring >=0.10.8.1,
@@ -153,7 +153,7 @@
     main-is: Spec.hs
     build-depends:
         base >=4.8 && <5,
-        b9 >=0.5.30,
+        b9 >=0.5.31,
         hspec >=2.2.4,
         hspec-expectations >=0.7.2,
         QuickCheck >=2.8.2,
diff --git a/src/lib/B9/LibVirtLXC.hs b/src/lib/B9/LibVirtLXC.hs
--- a/src/lib/B9/LibVirtLXC.hs
+++ b/src/lib/B9/LibVirtLXC.hs
@@ -35,7 +35,10 @@
           domainFile = buildBaseDir </> uuid' <.> domainConfig
           domain = createDomain cfg env buildId uuid' scriptDirHost scriptDirGuest
           uuid' = printf "%U" uuid
-          script = Begin [scriptIn, successMarkerCmd scriptDirGuest]
+          setupEnv = Begin [ Run "export" ["HOME=/root"]
+                           , Run "export" ["USER=root"]
+                           , Run "source" ["/etc/profile"]]
+          script = Begin [setupEnv, scriptIn, successMarkerCmd scriptDirGuest]
           buildDir = buildBaseDir </> uuid'
       liftIO $ do
         createDirectoryIfMissing True scriptDirHost
@@ -50,9 +53,6 @@
       let virsh = virshCommand cfg
       cmd $ printf "%s create '%s' --console --autodestroy" virsh domainFile
       -- cmd $ printf "%s console %U" virsh uuid
-      checkSuccessMarker scriptDirHost
-
-    checkSuccessMarker scriptDirHost =
       liftIO (doesFileExist $ scriptDirHost </> successMarkerFile)
 
     successMarkerFile = "SUCCESS"
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml