diff --git a/jobs/templates/swh-pipeline.yaml b/jobs/templates/swh-pipeline.yaml
index 5926158..9fff44a 100644
--- a/jobs/templates/swh-pipeline.yaml
+++ b/jobs/templates/swh-pipeline.yaml
@@ -1,170 +1,178 @@
 - job-template:
     name: "{name}/tests"
     display-name: "master branch"
     project-type: pipeline
     triggers:
       - timed: '@daily'
     sandbox: true
     auth-token: 'ph4br1cat0r'
     properties:
       - build-discarder:
           num-to-keep: 20
     parameters:
       - git-parameter:
           name: REVISION
           type: PT_REVISION
           defaultValue: master
           description: Git revision to build.
       - string:
           name: PHID
           description: PHID of the Phabricator target object on which results will be reported.
       - string:
           name: PYPI
           description: |
             PYPI registry to publish to when built revision is a tag. There
             must exists a usernamePassword credential object with that name.
-            The publication endpoint is built as https://$PYPI/legagy/
+            The pypi JSON API endpoint is built as https://$PYPI/project/<name>/json
           default: test.pypi.org
+      - string:
+          name: PYPI_UPLOAD
+          description: |
+            PYPI upload base host. If unset, defaults to $PYPI. The upload endpoint is built as
+            https://$PYPI_UPLOAD/legagy/
       - bool:
           name: FORCE_UPLOAD
           default: false
           description: |
             Force uploading python packages on the chosen PYPI registry.
 
     dsl: |
       pipeline {{
         agent {{ label 'swh-tox' }}
         environment {{
           PHAB_CONDUIT_URL = 'https://forge.softwareheritage.org/api/'
         }}
 
         stages {{
           stage('Checkout') {{
             steps {{
                 withCredentials([
                   string(credentialsId: 'swh-public-ci',
                          variable: 'PHAB_CONDUIT_TOKEN')]) {{
                   sh '''
                   if [ -n "$PHID" ]; then
                     python3 -m pyarcanist send-message work $PHID
                   fi
                   '''
                 }}
                 checkout([$class: 'GitSCM',
                           branches: [[name: "${{params.REVISION}}"]],
                           doGenerateSubmoduleConfigurations: false,
                           extensions: [],
                           gitTool: 'Default',
                           submoduleCfg: [],
                           userRemoteConfigs: [[url: 'https://forge.softwareheritage.org/source/{display-name}.git']]
                         ])
             }}
           }}
 
           stage('Static analysis') {{
             steps {{
               echo 'flake8'
               sh '''python3 -m detox -e flake8'''
 
               echo 'radon';
               sh  '''
               mkdir -p reports
               python3 -m radon raw --json swh/ > reports/raw_report.json
               python3 -m radon cc  --json swh/ > reports/cc_report.json
               python3 -m radon mi  --json swh/ > reports/mi_report.json
               python3 -m radon hal --json swh/ > reports/hal_report.json
               python3 -m radon cc  --xml  swh/ > reports/cc_report.xml
               '''
             }}
           }} // static analysis
 
           stage('Unit tests') {{
             options {{
               timeout(time: 5, unit: 'MINUTES')
             }}
             steps {{
               sh '''
               python3 -m tox -e py3 -- \
                 --cov-report=xml \
                 --junit-xml=test-results.xml
               '''
               }}
             post {{
               always {{
                 step([$class: 'CoberturaPublisher',
                       autoUpdateHealth: false,
                       autoUpdateStability: false,
                       coberturaReportFile: 'coverage.xml',
                       failNoReports: false,
                       failUnhealthy: false,
                       failUnstable: false,
                       maxNumberOfBuilds: 10,
                       onlyStable: false,
                       sourceEncoding: 'ASCII',
                       zoomCoverageChart: false])
                 // JUnit report
                 junit allowEmptyResults: true,
                       testResults: 'test-results.xml'
 
                 // disabled for now, requires the plugin Warning v5 (still in RC)
                 //recordIssues enabledForFailure: true,
                 //    tools: [[pattern: '**/reports/cc_report.xml', tool: [$class: 'Ccm']]]
               }}
             }} // post
           }} // unit tests
 
           stage('Build') {{
             steps {{
               sh 'python3 setup.py sdist bdist_wheel'
             }}
           }}
 
           stage('Publish') {{
             when {{ anyOf {{
               expression {{ return params.FORCE_UPLOAD }}
               expression {{
                 GITTAG=sh(returnStdout: true,
                           script:'git describe --exact-match 2>/dev/null || true').trim()
                 LASTV=sh(returnStdout: true,
-                         script:'curl -s https://${{params.PYPI}}/pypi/`python setup.py --name`/json | jq -r .info.version || true').trim()
+                         script:'curl -s https://${{PYPI}}/pypi/`python setup.py --name`/json | jq -r .info.version || true').trim()
                 return ! (GITTAG in ['', 'v'+LASTV])
                 }}
               }}
             }}
             steps {{
               withCredentials([
                  usernamePassword(credentialsId: "${{params.PYPI}}",
                                   usernameVariable: 'TWINE_USERNAME',
                                   passwordVariable: 'TWINE_PASSWORD')]) {{
-                sh 'python3 -m twine upload --repository-url https://${{PYPI}}/legacy/ dist/*'
+                sh '''
+                if [ -z "$PYPI_UPLOAD" ]; then PYPI_UPLOAD=$PYPI; fi
+                python3 -m twine upload --repository-url https://${{PYPI_UPLOAD}}/legacy/ dist/*
+                '''
               }}
             }}
           }}
         }} // stages
 
         post {{
           always {{
             // Archive a few report files
             archiveArtifacts allowEmptyArchive: true,
                              artifacts: 'reports/*,*.xml,tox*.ini',
                              fingerprint: true
             withCredentials([
                  string(credentialsId: 'swh-public-ci',
                         variable: 'PHAB_CONDUIT_TOKEN')]) {{
                   withEnv(["JOBSTATUS=${{currentBuild.currentResult}}"]) {{
                     sh '''
                     if [ "$JOBSTATUS" = "SUCCESS" ]; then
                       MSGTYPE=pass
                     else
                       MSGTYPE=fail
                     fi
                     echo "Current job status is $JOBSTATUS -> $MGSTYPE"
                     if [ -n "$PHID" ]; then
                       python3 -m pyarcanist send-message $MSGTYPE $PHID
                     fi
                     '''
                   }} // withEnv
             }} // withCredentials
           }} // always
         }} // post
       }} // pipeline