diff --git a/Dockerfile.bionic b/Dockerfile.bionic
index 753bb60..96905d4 100644
--- a/Dockerfile.bionic
+++ b/Dockerfile.bionic
@@ -13,5 +13,7 @@ RUN set -ex; \
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
+WORKDIR /usr/share/bcc/tools
+
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/bin/bash"]
diff --git a/Dockerfile.trusty b/Dockerfile.trusty
index c11c174..504a6a6 100644
--- a/Dockerfile.trusty
+++ b/Dockerfile.trusty
@@ -13,5 +13,7 @@ RUN set -ex; \
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
+WORKDIR /usr/share/bcc/tools
+
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/bin/bash"]
diff --git a/Dockerfile.xenial b/Dockerfile.xenial
index 301fa3c..fa2c388 100644
--- a/Dockerfile.xenial
+++ b/Dockerfile.xenial
@@ -13,5 +13,7 @@ RUN set -ex; \
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
+WORKDIR /usr/share/bcc/tools
+
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/bin/bash"]
diff --git a/Makefile b/Makefile
index d9414a5..898b2fa 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ push.${1}:
 
 .PHONY: run.${1}
 run.${1}:
-	docker run -it --rm $(DOCKER_CAPS) $(DOCKER_VOLUMES) --workdir /usr/share/bcc/ $(REPO):${1}
+	docker run -it --rm $(DOCKER_CAPS) $(DOCKER_VOLUMES) $(REPO):${1}
 endef #ADD_TARGET
 
 .PHONY: build push
diff --git a/README.md b/README.md
index 1158fc7..4c061cb 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@ docker run -it --rm \
   -v /lib/modules:/lib/modules:ro \
   -v /usr/src:/usr/src:ro \
   -v /etc/localtime:/etc/localtime:ro \
-  --workdir /usr/share/bcc/tools \
   zlim/bcc
 ```