diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index 01340fb0a..01cf7c5b0 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -399,6 +399,8 @@
                                         <ant antfile="upload.xml" target="upload" inheritRefs="true">
                                             <property name="nightly.user.name" value="${nightly.user.name}" />
                                             <property name="nightly.password" value="${nightly.password}" />
+                                            <property name="nightly.keyfile" value="${nightly.keyfile}" />
+                                            <property name="nightly.passphrase" value="${nightly.passphrase}" />
                                             <property name="nightly.version" value="${nightly.version}" />
                                             <property name="project.version" value="${project.version}" />
                                         </ant>
diff --git a/openjpa-project/upload.xml b/openjpa-project/upload.xml
index e2fd859c5..79446bfd9 100644
--- a/openjpa-project/upload.xml
+++ b/openjpa-project/upload.xml
@@ -49,23 +49,23 @@
             </fileset>
         </checksum>
         
-        <scp todir="${nightly.user.name}:${nightly.password}@${host}:${build.dir}" trust="true">
+        <scp todir="${nightly.user.name}@${host}:${build.dir}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" trust="true" sftp="true">
             <fileset dir="target/site/tempDocs"> 
                 <include name="docs.zip"/>
             </fileset>
         </scp>
         <!-- remove directories, hopefully this fails silently. mkdir does not and stops the process these exist.-->
-        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/docs" trust="true" />
-        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/downloads" trust="true" />
-        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="unzip -qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" />
-        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="rm ${build.dir}/docs.zip" trust="true" />
-        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="mkdir ${build.dir}/apache-openjpa-${project.version}/downloads " trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/docs" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm -Rf ${build.dir}/apache-openjpa-${project.version}/downloads" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="unzip -qq -d ${build.dir}/ ${build.dir}/docs.zip" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="rm ${build.dir}/docs.zip" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="mkdir ${build.dir}/apache-openjpa-${project.version}/downloads " trust="true" />
         
-        <scp todir="${nightly.user.name}:${nightly.password}@${host}:${build.dir}/apache-openjpa-${project.version}/downloads" trust="true">
+        <scp todir="${nightly.user.name}@${host}:${build.dir}/apache-openjpa-${project.version}/downloads" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" trust="true">
             <fileset dir="target/site/downloads" />
         </scp>
         
-        <sshexec host="${host}" username="${nightly.user.name}" password="${nightly.password}" command="chmod -R g+w ${build.dir}/apache-openjpa-${project.version}" trust="true" />
+        <sshexec host="${host}" username="${nightly.user.name}" keyfile="${nightly.keyfile}" passphrase="${nightly.passphrase}" command="chmod -R g+w ${build.dir}/apache-openjpa-${project.version}" trust="true" />
         
         <delete>
             <fileset dir="target/site/tempDocs" />