diff --git a/zsh/funcs.sh b/zsh/funcs.sh
index b34bff3..620f374 100644
--- a/zsh/funcs.sh
+++ b/zsh/funcs.sh
@@ -149,12 +149,12 @@ function rserv()
 function pod_ssh {
   if [[ $1 == "production" ]]
   then
-    kubectl config use-context production-1-26
+    kubectl config use-context production-1-27
   elif [[ $1 == "staging" ]]
   then
-    kubectl config use-context staging-1-26
+    kubectl config use-context staging-1-27
   else
-    kubectl config use-context testing-1-26
+    kubectl config use-context testing-1-27
   fi
 
   POD_ID=$(kubectl get pods --field-selector=status.phase=Running | grep -m1 -E "$1-.{9,10}-" | awk '{print $1}')
diff --git a/zsh/git.sh b/zsh/git.sh
index d08cace..221d890 100644
--- a/zsh/git.sh
+++ b/zsh/git.sh
@@ -26,7 +26,7 @@ alias gm='git merge'
 alias gp='git pull'
 alias gpa='git pull --all'
 alias gpp='gp && git push origin `current_git_branch`'
-alias push='git push origin `current_git_branch`'
+alias push='git push -u origin `current_git_branch`'
 alias gprp='gp && rake && gpp'
 alias gri='git rebase -i origin/master^'
 alias grc='git rebase --continue'
@@ -48,6 +48,7 @@ alias gb='git branch'
 # complete -o default -o nospace -F _git_branch gb
 
 alias gtrack='git branch --track'
+alias gtracksame='git branch --set-upstream-to=origin/`current_git_branch` `current_git_branch`'
 
 alias gcb='git checkout -b'
 # complete -o default -o nospace -F _git_branch gcb