diff --git a/experiment/prepare_release_branch.py b/experiment/prepare_release_branch.py
index b1c7d5eb8c49c..a4bddc089fd71 100644
--- a/experiment/prepare_release_branch.py
+++ b/experiment/prepare_release_branch.py
@@ -84,11 +84,16 @@ def update_generated_config(path, latest_version):
     suffixes = ['beta', 'stable1', 'stable2', 'stable3']
     for i, s in enumerate(suffixes):
         vs = "%d.%d" % (v[0], v[1] + 1 - i)
-        config['k8sVersions'][s]['version'] = vs
+        markers = config['k8sVersions'][s]
+        markers['version'] = vs
+        for j, arg in enumerate(markers['args']):
+            markers['args'][j] = re.sub(
+                r'latest(-\d+\.\d+)?', 'latest-%s' % vs, arg)
+
         node = config['nodeK8sVersions'][s]
-        for j, arg in enumerate(node['args']):
-            node['args'][j] = re.sub(
-                r'release-\d+\.\d+', 'release-%s' % vs, arg)
+        for k, arg in enumerate(node['args']):
+            node['args'][k] = re.sub(
+                r'master|release-\d+\.\d+', 'release-%s' % vs, arg)
         node['prowImage'] = node['prowImage'].rpartition('-')[0] + '-' + vs
 
     with open(path, 'w') as f:
diff --git a/experiment/test_config.yaml b/experiment/test_config.yaml
index e465a1b968673..40224fc915697 100644
--- a/experiment/test_config.yaml
+++ b/experiment/test_config.yaml
@@ -810,19 +810,19 @@ k8sVersions:
     version: master
   beta:
     args:
-    - --extract=ci/k8s-beta
+    - --extract=ci/latest-1.17
     version: '1.17'
   stable1:
     args:
-    - --extract=ci/k8s-stable1
+    - --extract=ci/latest-1.16
     version: '1.16'
   stable2:
     args:
-    - --extract=ci/k8s-stable2
+    - --extract=ci/latest-1.15
     version: '1.15'
   stable3:
     args:
-    - --extract=ci/k8s-stable3
+    - --extract=ci/latest-1.14
     version: '1.14'
 
 testSuites: