diff --git a/zsh/plugins/compinit.plugin.zsh b/zsh/plugins/compinit.plugin.zsh
index 8775fca..e886874 100644
--- a/zsh/plugins/compinit.plugin.zsh
+++ b/zsh/plugins/compinit.plugin.zsh
@@ -1,5 +1,8 @@
 #!/usr/bin/env zsh
 
+# Add custom docker completion to fpath
+FPATH="$HOME/.docker/completions:$FPATH"
+
 # Load all stock functions (from $fpath files) called below.
 autoload -U compaudit compinit
 
diff --git a/zshrc.zsh b/zshrc.zsh
index 3237f82..d0836fc 100644
--- a/zshrc.zsh
+++ b/zshrc.zsh
@@ -95,6 +95,9 @@ if (( ${+commands[brew]} )); then
   test -d $(brew --prefix)/opt/curl && export PATH="$(brew --prefix)/opt/curl/bin:$PATH"
 fi
 
+# Local Docker if set up that way
+test -d $HOME/.docker/bin && export PATH="$HOME/.docker/bin:$PATH"
+
 # Rainfrog config
 export RAINFROG_CONFIG=~/.config/rainfrog