diff --git a/Dockerfile b/Dockerfile
index 1d4f55b..23d0ea6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM library/alpine:3.5
+FROM library/docker:1.13
 
 ENV HOME_DIR=/opt/crontab
 RUN apk add --no-cache --virtual .run-deps bash jq \
diff --git a/docker-compose.yml b/docker-compose.yml
index 55f00d1..9c3e550 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,5 +11,5 @@ services:
     restart: always
     volumes:
      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-     - "/usr/bin/docker:/usr/bin/docker:ro"
+    # - "/usr/bin/docker:/usr/bin/docker:ro"
      - "/Users/willfarrell/Development/docker/crontab/home_dir:/opt/crontab:rw"
diff --git a/docker-entrypoint b/docker-entrypoint
index 3e8efe7..cb7b8fd 100755
--- a/docker-entrypoint
+++ b/docker-entrypoint
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -e
 
+if [ -z "$DOCKER_HOST" -a "$DOCKER_PORT_2375_TCP" ]; then
+	export DOCKER_HOST='tcp://docker:2375'
+fi
+
 # for local testing only
 #HOME_DIR=.