diff --git a/project/scripts/genDocs b/project/scripts/genDocs
index 0e9ec8302fc6..ffccbca6569f 100755
--- a/project/scripts/genDocs
+++ b/project/scripts/genDocs
@@ -18,7 +18,7 @@ echo "Working directory: $PWD"
 
 # this command will generate docs in $PWD/docs/_site
 SBT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/sbt"
-eval "$SBT" "genDocs"
+"$SBT" "genDocs"
 
 # make sure that the previous command actually succeeded
 if [ ! -d "$PWD/docs/_site" ]; then
diff --git a/project/scripts/sbtPublish b/project/scripts/sbtPublish
index b29233df10e1..e089fbb07d2f 100755
--- a/project/scripts/sbtPublish
+++ b/project/scripts/sbtPublish
@@ -23,12 +23,12 @@ if [ -z "$RELEASE_CMD" ]; then
   exit 1
 fi
 
-CMD="     ;set credentials in ThisBuild := Seq(Credentials(\"Sonatype Nexus Repository Manager\", \"oss.sonatype.org\", \"$2\", \"$3\"))"
-CMD="$CMD ;set pgpPassphrase := Some(\"\"\"$4\"\"\".toCharArray)"
+CMD="     ;set credentials in ThisBuild := Seq(Credentials(\"Sonatype Nexus Repository Manager\", \"oss.sonatype.org\", \"$SONATYPE_USER\", \"$SONATYPE_PW\"))"
+CMD="$CMD ;set pgpPassphrase := Some(\"\"\"$PGP_PW\"\"\".toCharArray)"
 CMD="$CMD ;set pgpSecretRing := file(\"/keys/secring.asc\")"
 CMD="$CMD ;set pgpPublicRing := file(\"/keys/pubring.asc\")"
 CMD="$CMD $RELEASE_CMD"
 
 # run sbt with the supplied arg
 SBT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/sbt"
-eval "$SBT" "$CMD"
+"$SBT" "$CMD"