diff --git a/Dockerfile b/Dockerfile
index 389a2c8..9c317d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,5 +5,5 @@
 FROM rancher/docker
 
 ADD drone-docker /go/bin/
-
+VOLUME /var/lib/docker
 ENTRYPOINT ["/go/bin/drone-docker"]
diff --git a/main.go b/main.go
index d60afc6..8d47e4a 100644
--- a/main.go
+++ b/main.go
@@ -64,7 +64,6 @@ func main() {
 
 		cmd := exec.Command("/usr/bin/dockerlaunch", args...)
 		if os.Getenv("DOCKER_LAUNCH_DEBUG") == "true" {
-			cmd.Env = os.Environ()
 			cmd.Stdout = os.Stdout
 			cmd.Stderr = os.Stderr
 		} else {
@@ -77,7 +76,7 @@ func main() {
 	}()
 
 	// Sleep for a few seconds
-	time.Sleep(35 * time.Second)
+	time.Sleep(5 * time.Second)
 
 	// Set the Registry value
 	if len(vargs.Registry) == 0 {