diff --git a/jobs/templates/swh-cypress.yaml b/jobs/templates/swh-cypress.yaml
index 0b2593b..7514af9 100644
--- a/jobs/templates/swh-cypress.yaml
+++ b/jobs/templates/swh-cypress.yaml
@@ -1,98 +1,98 @@
 - job-template:
     name: "{name}/cypress"
     display-name: "master branch (cypress)"
     project-type: pipeline
     docker-image: cypress
     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.
 
     dsl:
       !include-raw: swh-cypress.groovy
 
 
 - job-template:
     name: "{name}/cypress-diff"
     display-name: 'Phab. Diff (cypress)'
-    docker-image: swh-cypress
-    node: "{docker-image}"
+    docker-image: cypress
+    node: "swh-{docker-image}"
     auth-token: ph4br1cat0r
     parameters:
       - string:
           name: REPO
           description: PHID of the Diffusion repository
       - string:
           name: PHID
           description: PHID of the Target object
       - string:
           name: DIFF_ID
           description: ID of the Diff patch to apply, if any
     scm:
       - git:
           url: https://forge.softwareheritage.org/source/{display-name}.git
           branches:
             - origin/master
 
     wrappers:
       - phabricator-differential:
           apply-to-master: true
           patch-with-force-flag: true
 
 
     builders:
       - shell: |
           echo "Run cypress for:"
           echo "  REPO=$REPO"
           echo "  PHID=$PHID"
           echo "  DIFF_ID=$DIFF_ID"
       - shell: |
           #!/bin/bash
           set -e
           python3 -m pip install --user -e .[testing]
           export CYPRESS_CACHE_FOLDER=/tmp/cypress_cache/
           yarn install && yarn build-test && yarn run cypress install
           export PYTHONPATH=$PWD
           python3 swh/web/manage.py migrate --settings=swh.web.settings.tests
           python3 swh/web/manage.py createcachetable --settings=swh.web.settings.tests
           cat swh/web/tests/create_test_admin.py | python3 swh/web/manage.py shell --settings=swh.web.settings.tests
           python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.tests &
           wait-for-it localhost:5004
           yarn run cypress run
           yarn run mochawesome
           yarn run nyc-report
 
     publishers:
       - phabricator:
           uberalls-enabled: false
           comment-on-success: true
           comment-with-console-link-on-failure: true
           process-lint: true
           lint-file: .phabricator-lint
           lint-file-size: 1000000
       - html-publisher:
           name: 'Mochawesome Tests Report'
           dir: 'cypress/mochawesome/report'
           files: 'mochawesome.html'
           keep-all: true
           allow-missing: true
           link-to-last-build: false
       - html-publisher:
           name: 'Istanbul Code Coverage'
           dir: 'cypress/coverage/lcov-report'
           files: 'index.html'
           keep-all: true
           allow-missing: true
           link-to-last-build: false
diff --git a/jobs/templates/swh-pypi.yaml b/jobs/templates/swh-pypi.yaml
index 6704241..7f2c9a1 100644
--- a/jobs/templates/swh-pypi.yaml
+++ b/jobs/templates/swh-pypi.yaml
@@ -1,44 +1,44 @@
 - job-template:
     name: "{name}/pypi-upload"
     display-name: "Upload to PyPI"
-    docker-image: swh-tox
+    docker-image: tox
     project-type: pipeline
     sandbox: true
     properties:
       - build-discarder:
           num-to-keep: 20
     parameters:
       - git-parameter:
           name: GIT_TAG
           description: git tag to process
           type: PT_TAG
           sortMode: DESCENDING_SMART
           selectedValue: TOP
       - choice:
           name: PYPI_HOST
           description: |
             PYPI registry to publish to when built revision is a tag. There
             must exists a usernamePassword credential object with that name.
             The pypi JSON API endpoint is built as https://$PYPI_HOST/project/<name>/json
           choices:
             - test.pypi.org
             - pypi.org
           default: test.pypi.org
       - bool:
           name: FORCE_UPLOAD
           default: false
           description: |
             Force uploading python packages on the chosen PYPI registry, even if
             the package already exists.
       - bool:
           name: SKIP_TESTS
           default: false
           description: |
             Do not run tests on the repository.
       - bool:
           name: IGNORE_TESTS
           default: false
           description: |
             Proceed even if the tests are failing on the repository.
     dsl:
       !include-raw: swh-pypi.groovy