diff --git a/jobs/swh-packages.yaml b/jobs/swh-packages.yaml
index 5860324..0305214 100644
--- a/jobs/swh-packages.yaml
+++ b/jobs/swh-packages.yaml
@@ -1,192 +1,192 @@
 - job-group:
     name: 'swh-jobs-{name}'
     jobs:
       - "{name}"
       - "{name}/incoming-tag"
       - "{name}/pypi-upload"
       - "{name}/tests"
       - "{name}/tox"
       - "debian/packages/{name}"
       - "debian/packages/{name}/update-for-release"
       - "debian/packages/{name}/automatic-backport"
       - "debian/packages/{name}/gbp-buildpackage"
 
 - project:
     name: DCORE
     display-name: swh-core
     repo_name: swh-core
     pkg: core
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DDEP
     display-name: swh-deposit
     repo_name: swh-deposit
     pkg: deposit
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DGRPH
     display-name: swh-graph
     repo_name: swh-graph
     pkg: graph
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DCIDX
     display-name: swh-indexer
     repo_name: swh-indexer
     pkg: indexer
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DICP
     display-name: swh-icinga-plugins
     repo_name: swh-icinga-plugins
     pkg: icinga-plugins
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DJNL
     display-name: swh-journal
     repo_name: swh-journal
     docker_image: kafka
     pkg: journal
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DLS
     display-name: swh-lister
     repo_name: swh-lister
     pkg: lister
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DLDBASE
     display-name: swh-loader-core
     repo_name: swh-loader-core
     pkg: loader.core
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DLDG
     display-name: swh-loader-git
     repo_name: swh-loader-git
     pkg: loader.git
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DLDHG
     display-name: swh-loader-mercurial
     repo_name: swh-loader-mercurial
     pkg: loader.mercurial
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DLDSVN
     display-name: swh-loader-svn
     repo_name: swh-loader-svn
     pkg: loader.svn
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DMOD
     display-name: swh-model
     repo_name: swh-model
     pkg: model
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DOBJS
     display-name: swh-objstorage
     repo_name: swh-objstorage
     pkg: objstorage
     deb-extra-repositories: ceph
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DSEA
     display-name: swh-search
     repo_name: swh-search
     pkg: search
     deb-extra-repositories: elasticsearch
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: TSBX
     display-name: swh-sandbox
     repo_name: swh-sandbox
     pkg: sandbox
-    incoming-tag-auto-pypi-host: test.pypi.org
+    incoming_tag_auto_pypi_host: test.pypi.org
     jobs:
       - "{name}"
       - "{name}/incoming-tag"
       - "{name}/pypi-upload"
       - "{name}/tests"
       - "{name}/tox"
 
 - project:
     name: DTSCN
     display-name: swh-scanner
     repo_name: swh-scanner
     pkg: scanner
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DSCH
     display-name: swh-scheduler
     repo_name: swh-scheduler
     pkg: scheduler
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DSTO
     display-name: swh-storage
     repo_name: swh-storage
     pkg: storage
     deb-extra-repositories: cassandra
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DVAU
     display-name: swh-vault
     repo_name: swh-vault
     pkg: vault
     jobs:
       - 'swh-jobs-{name}'
 
 - project:
     name: DWAPPS
     display-name: swh-web
     repo_name: swh-web
     pkg: web
     jobs:
       - 'swh-jobs-{name}'
       - '{name}/cypress'
       - '{name}/cypress-diff'
 
 - project:
     name: DWCLI
     display-name: swh-web-client
     repo_name: swh-web-client
     pkg: web-client
     jobs:
       - 'swh-jobs-{name}'
 
diff --git a/jobs/templates/incoming-tag.groovy b/jobs/templates/incoming-tag.groovy
index 51a429b..38f5ae3 100644
--- a/jobs/templates/incoming-tag.groovy
+++ b/jobs/templates/incoming-tag.groovy
@@ -1,71 +1,71 @@
 pipeline {{
   agent none
   stages {{
     stage('Refresh tag list') {{
       agent any
       steps {{
         checkout([
           $class: 'GitSCM',
           userRemoteConfigs: [[
             url: 'https://forge.softwareheritage.org/source/{repo_name}.git',
           ]],
           branches: [[
             name: params.GIT_TAG,
           ]],
           browser: [
             $class: 'Phabricator',
             repo: '{repo_name}',
             repoUrl: 'https://forge.softwareheritage.org/',
           ],
         ])
       }}
     }}
     stage('Build and upload PyPI package') {{
       when {{
         expression {{ params.GIT_TAG ==~ /v\d+(.\d+)+/ }}
         expression {{ jobExists('/{name}/pypi-upload') }}
       }}
       steps {{
         build(
           job: '/{name}/pypi-upload',
           parameters: [
             string(name: 'GIT_TAG', value: params.GIT_TAG),
-            string(name: 'PYPI_HOST', value: '{incoming-tag-auto-pypi-host}'),
+            string(name: 'PYPI_HOST', value: '{incoming_tag_auto_pypi_host}'),
           ],
         )
       }}
     }}
     stage('Update Debian packaging for new release') {{
       when {{
         expression {{ params.GIT_TAG ==~ /v\d+(.\d+)+/ }}
         expression {{ jobExists('/debian/packages/{name}/update-for-release') }}
       }}
       steps {{
         build(
           job: '/debian/packages/{name}/update-for-release',
           parameters: [
             string(name: 'GIT_TAG', value: params.GIT_TAG),
           ],
           wait: false,
         )
       }}
     }}
     stage('Build Debian package') {{
       when {{
         expression {{ params.GIT_TAG ==~ /debian\/.*/ }}
         expression {{ !(params.GIT_TAG ==~ /debian\/upstream\/.*/) }}
         expression {{ jobExists('/debian/packages/{name}/gbp-buildpackage') }}
       }}
       steps {{
         build(
           job: '/debian/packages/{name}/gbp-buildpackage',
           parameters: [
             string(name: 'GIT_REVISION', value: params.GIT_TAG),
             booleanParam(name: 'DO_UPLOAD', value: true),
           ],
           wait: false,
         )
       }}
     }}
   }}
 }}
diff --git a/jobs/templates/incoming-tag.yaml b/jobs/templates/incoming-tag.yaml
index 27764ed..f72e6b2 100644
--- a/jobs/templates/incoming-tag.yaml
+++ b/jobs/templates/incoming-tag.yaml
@@ -1,22 +1,22 @@
 - job-template: &incoming_tag
     name: "{name}/incoming-tag"
     display-name: Incoming tag
     project-type: pipeline
     auth-token: 'ph4br1cat0r'
-    incoming-tag-auto-pypi-host: pypi.org
+    incoming_tag_auto_pypi_host: pypi.org
     sandbox: true
     parameters:
       - git-parameter:
           name: GIT_TAG
           description: git tag to process
           type: PT_TAG
           sortMode: DESCENDING_SMART
           selectedValue: TOP
     dsl:
       !include-raw: incoming-tag.groovy
 
 - job-template:
     name: "debian/deps/{name}/incoming-tag"
     dsl:
       !include-raw: dependency-incoming-tag.groovy
     <<: *incoming_tag