diff --git a/dot_config/task/intheam.tmpl b/dot_config/task/intheam.tmpl
index e7a07a3..7608ca2 100644
--- a/dot_config/task/intheam.tmpl
+++ b/dot_config/task/intheam.tmpl
@@ -2,5 +2,5 @@ taskd.certificate=/home/kellya/.config/task/intheam_certs/private.certificate.pe
 taskd.key=/home/kellya/.config/task/intheam_certs/private.key.pem
 taskd.ca=/home/kellya/.config/task/intheam_certs/ca.cert.pem
 taskd.server=inthe.am:53589
-taskd.credentials=inthe_am/kellya/{{ (index (lastpass "intheam_token") 0).password }}
+taskd.credentials={{ onepasswordRead "op://Private/intheam_token/password" }}
 taskd.trust=strict
diff --git a/dot_config/task/wingtask.tmpl b/dot_config/task/wingtask.tmpl
index 31e24fd..38f7f3e 100644
--- a/dot_config/task/wingtask.tmpl
+++ b/dot_config/task/wingtask.tmpl
@@ -2,4 +2,4 @@ taskd.server=app.wingtask.com:53589
 taskd.key=/home/kellya/.config/task/wingtask_certs/alex.kelly@arachnitech.com.key.pem
 taskd.ca=/home/kellya/.config/task/wingtask_certs/letsencrypt_root_cert.pem
 taskd.certificate=/home/kellya/.config/task/wingtask_certs/alex.kelly@arachnitech.com.cert.pem
-teaskd.credentials=WingTask/alex.kelly@arachnitech.com/{{ (index (lastpass "wingtask_token") 0).password }}
+teaskd.credentials=WingTask/alex.kelly@arachnitech.com/{{- onepasswordRead "op://Private/wingtask_token/password" -}}
diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 85c97b7..6cd52ea 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -15,8 +15,8 @@
 [push]
     default = simple
 [github]
-    user = {{ (index (lastpass "github_token") 0).username | quote }}
-    token = {{ (index (lastpass "github_token") 0).password | quote }}
+    user = {{ onepasswordRead "op://Private/github.com/username" }}
+    token = {{ onepasswordRead "op://Private/github.com/password" }}
 [diff]
     tool = meld
 [difftool]
diff --git a/dot_zshrc b/dot_zshrc
index d8d7102..6fa9b20 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -189,3 +189,4 @@ PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source /home/kellya/.config/tea/autocomple
 export PATH="/home/kellya/.deta/bin:$PATH"
 
 eval $(thefuck --alias)
+eval "$(op completion zsh)"; compdef _op op