diff --git a/gitlab/deploy.sh b/gitlab/deploy.sh
index d3c75722cc4261dc949f54d9107f39033cd7c7d5..1221b1897463a642d49f9466518ccb9f6cb3391b 100755
--- a/gitlab/deploy.sh
+++ b/gitlab/deploy.sh
@@ -10,7 +10,7 @@ setup check sdist --formats zip upload --repository staging
 # if that worked, uploads documentation to pythonhosted if any exists
 if [ -d sphinx ]; then
   log_info "Uploading documentation to pythonhosted on behalf of ${PYPIUSER}..."
-  setup upload_docs --upload-dir sphinx
+  setup upload_docs --upload-dir sphinx --repository production
 fi
 
 # if that worked, uploads source package to the production index
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index e226657a0a473cd02bd5b56ded3d4d36746230ba..e7f6c3a0ecc9d5239d6775618b6dcdb35fca8b6c 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -67,9 +67,12 @@ setup() {
 
 # Prepares ~/.pypirc
 dot_pypirc() {
-  check_env PYPISERVER
-  log_info "Creating ~/.pypirc..."
-  cat <<EOT >> ~/.pypirc
+  local rc=${HOME}/.pypirc
+  log_info "Creating ${rc}..."
+  if [ -e ${rc} ]; then
+    run_cmd rm -f ${rc}
+  fi
+  cat <<EOT >> ${rc}
 [distutils]
 index-servers =
     production
@@ -85,15 +88,12 @@ repository: ${TESTSERVER}
 username: ${PYPIUSER}
 password: ${PYPIPASS}
 EOT
-  run_cmd chmod 600 ~/.pypirc
+  run_cmd chmod 600 ${rc}
 }
 
 
 # Uploads a file to our intranet location via curl
 doc_upload() {
-  check_env DOCSERVER
-  check_pass DOCUSER
-  check_pass DOCPASS
   log_info "curl: ${1} -> ${DOCSERVER}/${2}..."
   curl --location --silent --show-error --user "${DOCUSER}:${DOCPASS}" --upload-file ${1} ${DOCSERVER}/${2}
   local status=$?