diff --git a/bashrc.d/local/stbbri-sec-1.bash b/bashrc.d/local/stbbri-sec-1.bash
index ceb5b8e..a51054e 100644
--- a/bashrc.d/local/stbbri-sec-1.bash
+++ b/bashrc.d/local/stbbri-sec-1.bash
@@ -25,11 +25,14 @@ alias log2='git log --graph --oneline --all --decorate=full'
 alias v=vbindiff
 alias ctags=ctags-exuberant
 
-export JTAG_IP=10.178.4.224
+export JTAG_IP=10.178.4.31
+
+# For use with jira-cli
+export JIRA_AUTH_TYPE=bearer
 
 # Misc work
-alias jtagserial='telnet $JTAG_IP 2300'
-alias jtagserial2="telnet $EJTAG_IP 2301"
+alias jtagserial='ssh -o IdentityFile=~/.ssh/brcmstb_root root@$JTAG_IP -p 2200'
+alias jtagserial2='ssh -o IdentityFile=~/.ssh/brcmstb_root root@$JTAG_IP -p 2201'
 
 # Security
 # WEBFLASH_SERVER=stbgit.broadcom.com/webflasher-test
@@ -38,9 +41,9 @@ alias flashfirstimagez4='flash -s 0x100000'
 alias flashfirstimage='flash -s 0x180000'
 
 alias goscratch='cd /local/scratch/pw921828'
+alias gomarvin='cd /local/scratch/pw921828/marvin && source .venv/bin/activate && source env.sh'
 alias goproj="cd /local/proj/irdeto"
 alias gorelease="cd /local/releases/irdeto"
-alias govm="cd /projects/Security/scratch/pw921828/ifcp-vm"
 
 alias bounce='rsync -av $NEXUS_TOP/../$B_REFSW_OBJ_DIR/nexus/bin/* /local/home/pw921828/tmp/bounce/'
 alias m="make && bounce"
@@ -56,3 +59,4 @@ PERL_MB_OPT="--install_base \"$HOME/perl5\""; export PERL_MB_OPT;
 PERL_MM_OPT="INSTALL_BASE=$HOME/perl5"; export PERL_MM_OPT;
 
 export SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/ssh-agent.socket"
+