diff --git a/.circleci/config.yml b/.circleci/config.yml
index d5193013..9b6625d7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  orbtools: gofunky/orbtools@dev:0.0.15
+  orbtools: gofunky/orbtools@dev:0.0.16
   envorb: gofunky/envorb@0.2.6
 
 master_filter: &master_filter
diff --git a/src/@orb.yml b/src/@orb.yml
index e5393dda..9543e247 100644
--- a/src/@orb.yml
+++ b/src/@orb.yml
@@ -43,9 +43,9 @@ commands:
             NOTE: this currently assumes you are publishing to the registry at circleci.com
           command: |
             source /usr/local/bin/envload
-            export REPOSITORY_ORGANIZATION=$(git remote -v | grep "(fetch)" | sed 's/.*\/\([^ ]*\)\/.*/\1/')
+            export REPOSITORY_ORGANIZATION=$(git config --get remote.origin.url | rev | tr '.:' '/' | cut -d'/' -f3 | rev)
             echo "SET REPOSITORY_ORGANIZATION: ${REPOSITORY_ORGANIZATION}"
-            export REPOSITORY_NAME=$(basename -s .git `git config --get remote.origin.url`)
+            export REPOSITORY_NAME=$(git config --get remote.origin.url | rev | tr '.:' '/' | cut -d'/' -f2 | rev)
             echo "SET REPOSITORY_NAME: ${REPOSITORY_NAME}"
             circleci orb publish << parameters.orb-path >> << parameters.orb-ref >> <<# parameters.token-variable >>--token << parameters.token-variable >> <</ parameters.token-variable >>