diff --git a/znoyder/config.d/01-branches.yml b/znoyder/config.d/01-branches.yml
index b68c52c..b1884fb 100644
--- a/znoyder/config.d/01-branches.yml
+++ b/znoyder/config.d/01-branches.yml
@@ -2,10 +2,10 @@
 branches:
   'osp-16.1':
     downstream: '^rhos-16.1-trunk-patches$'
-    upstream: 'stable/train'
+    upstream: 'train-eol'
   'osp-16.2':
     downstream: '^rhos-16.2-trunk-patches$'
-    upstream: 'stable/train'
+    upstream: 'train-eol'
   'osp-17.0':
     downstream: '^rhos-17.0-trunk-patches$'
     upstream: 'stable/wallaby'
diff --git a/znoyder/config.d/31-add-OSP-16.yml b/znoyder/config.d/31-add-OSP-16.yml
index cf9bc1d..816c8f6 100644
--- a/znoyder/config.d/31-add-OSP-16.yml
+++ b/znoyder/config.d/31-add-OSP-16.yml
@@ -102,7 +102,7 @@ add:
         vars:
           extra_commands:
             - dnf install -y python3-testscenarios
-            - sudo -u zuul pip3 install --user -c https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt python-blazarclient python-monascaclient python-zunclient
+            - sudo -u zuul pip3 install --user -c https://opendev.org/openstack/requirements/raw/tag/train-eol/upper-constraints.txt python-blazarclient python-monascaclient python-zunclient
       'osp-tox-pep8':
         pipeline:
           - 'check'
@@ -115,7 +115,7 @@ add:
         vars:
           extra_commands:
             - dnf install -y python3-testscenarios
-            - sudo -u zuul pip3 install --user -c https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt python-blazarclient python-monascaclient python-zunclient
+            - sudo -u zuul pip3 install --user -c https://opendev.org/openstack/requirements/raw/tag/train-eol/upper-constraints.txt python-blazarclient python-monascaclient python-zunclient
       'osp-tox-pep8':
         pipeline:
           - 'check'
@@ -235,7 +235,7 @@ add:
         vars:
           extra_commands:
             - dnf install -y python3-pycodestyle python3-ddt python3-hacking python3-ironicclient python3-mock python3-oslotest python3-osprofiler python3-requests-mock python3-stestr python3-testresources python3-testscenarios python3-wsgi_intercept python3-os-xenapi
-            - pip3 install -c https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt pypowervm zVMCloudConnector
+            - pip3 install -c https://opendev.org/openstack/requirements/raw/tag/train-eol/upper-constraints.txt pypowervm zVMCloudConnector
             - dnf remove -y libguestfs libvirt-client
       'osp-tox-pep8':
         pipeline:
@@ -348,7 +348,7 @@ add:
           - 'check'
         vars:
           tox_environment:
-            UPPER_CONSTRAINTS_FILE: https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt
+            UPPER_CONSTRAINTS_FILE: https://opendev.org/openstack/requirements/raw/tag/train-eol/upper-constraints.txt
           tox_install_bindep: false
     'osp-16.2':
       'osp-rpm-py36':
@@ -376,7 +376,7 @@ add:
           - 'check'
         vars:
           extra_commands:
-            - sed -i -r 's#https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt#https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt#g' {{ zuul.project.src_dir }}/tox.ini
+            - sed -i -r 's#https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt#https://opendev.org/openstack/requirements/raw/tag/train-eol/upper-constraints.txt#g' {{ zuul.project.src_dir }}/tox.ini
     'osp-16.2':
       'osp-rpm-py36':
         pipeline:
@@ -389,7 +389,7 @@ add:
           - 'check'
         vars:
           extra_commands:
-            - sed -i -r 's#https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt#https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt#g' {{ zuul.project.src_dir }}/tox.ini
+            - sed -i -r 's#https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt#https://opendev.org/openstack/requirements/raw/tag/train-eol/upper-constraints.txt#g' {{ zuul.project.src_dir }}/tox.ini
 
   'python-neutron-tests-tempest':
     'osp-16.1':
@@ -475,7 +475,7 @@ add:
         vars:
           extra_commands:
             - dnf install -y python3-boto3 python3-mock python3-os-testr python3-swiftclient
-            - pip3 install -c https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt boto
+            - pip3 install -c https://opendev.org/openstack/requirements/raw/tag/train-eol/upper-constraints.txt boto
           tox_envlist: func-py3
       'osp-rpm-py36':
         pipeline:
@@ -500,7 +500,7 @@ add:
         vars:
           extra_commands:
             - dnf install -y python3-boto3 python3-mock python3-os-testr python3-swiftclient
-            - pip3 install -c https://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt boto
+            - pip3 install -c https://opendev.org/openstack/requirements/raw/tag/train-eol/upper-constraints.txt boto
           tox_envlist: func-py3
       'osp-rpm-py36':
         pipeline: