diff --git a/jjb/shell/github-release.sh b/jjb/shell/github-release.sh
index 58164c4..14dd5c7 100755
--- a/jjb/shell/github-release.sh
+++ b/jjb/shell/github-release.sh
@@ -188,14 +188,17 @@
 	gh)
 	    declare -a cmd=()
 
+	    ## [TODO] Refactor into a function accepting:
+	    ##   --create
+	    ##   --info
+	    ##   --upload
 	    cmd+=("$gh_cmd")
 	    # cmd+=('--verbose')
-	    cmd+=('release')	
-	    cmd+=('create')
-	    cmd+=('--user' "$user")
-	    cmd+=('--repo' "$repo")
+	    cmd+=('release' 'create')	
+	    # cmd+=('--latest')
+	    cmd+=('--repo' "opencord/$repo")
 	    cmd+=('--title'  "$name")
-	    cmd+=('--descripton'  "$descr")
+	    # cmd+=('--descripton'  "$descr") # not supported
 	    cmd+=('--discussion-category' "Announcements")
 	    # cmd+=('--latest') - auto based on date & ver
 	    cmd+=('--verify-tag')
@@ -274,6 +277,11 @@
 init
 install_gh_binary
 
+echo "==========================================================================="
+set
+echo "==========================================================================="
+
+
 # when not running under Jenkins, use current dir as workspace and a blank
 # project name
 WORKSPACE=${WORKSPACE:-.}
@@ -395,7 +403,12 @@
     # shellcheck disable=SC2194
     case 'gh' in
 	gh)
-	    "$gh_cmd" release upload "$GIT_VERSION" "${to_release[@]}"
+	    declare -a cmd=()
+	    cmd+=("$gh_cmd")
+	    cmd+=('release' 'upload')
+	    cmd+=('--repo' "opencord/${GERRIT_PROJECT}")
+	    cmd+=("${to_release[@]}")
+	    "${cmd[@]}"
 	    ;;
 
 	*)