Merge "cloudbuild:  Update the build version to be the same as run version." into main
diff --git a/src/cloudbuild_v2.yaml b/src/cloudbuild_v2.yaml
index 98fa04a..4b1c8b1 100644
--- a/src/cloudbuild_v2.yaml
+++ b/src/cloudbuild_v2.yaml
@@ -31,85 +31,85 @@
 
 steps:
   - id: buster-slim
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/debian:buster-slim"]
     waitFor: ['-']
   - id: alpine-git
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/alpine/git"]
     waitFor: ['-']
   - id: dockerfile-copy
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/docker/dockerfile-copy:v0.1.9"]
     waitFor: ['-']
   - id: buster
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/debian:buster"]
     waitFor: ['-']
   - id: python-3.7-slim
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/python:3.7-slim-buster"]
     waitFor: ['-']
   - id: python-3.7
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/python:3.7-buster"]
     waitFor: ['-']
   - id: mariadb
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/mariadb:10.5"]
     waitFor: ['-']
   - id: python-3.8-slim
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/python:3.8-slim-buster"]
     waitFor: ['-']
   - id: python-3.8
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/python:3.8-buster"]
     waitFor: ['-']
   - id: envoyproxy
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/envoyproxy/envoy:v1.15.2"]
     waitFor: ['-']
   - id: openssh-server
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/linuxserver/openssh-server"]
     waitFor: ['-']
   - id: watchtower
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/v2tec/watchtower:latest"]
     waitFor: ['-']
   - id: docker-compose
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/docker/compose:alpine-1.27.4"]
     waitFor: ['-']
   - id: node-buster
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/node:15-buster"]
     waitFor: ['-']
   - id: node15
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/node:15"]
     waitFor: ['-']
   - id: alpine-edge
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/alpine:edge"]
     waitFor: ['-']
   - id: nginx-alpine
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/nginx:alpine"]
     waitFor: ['-']
   - id: python-2
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/python:2-buster"]
     waitFor: ['-']
   - id: blacklabelops_logrotate
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args: ["pull", "${_BASE_REGISTRY_URI}/blacklabelops/logrotate:latest"]
     waitFor: ['-']
 
 
   - id: protoc
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -125,7 +125,7 @@
       - "buster-slim"
 
   - id: chromite
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -155,7 +155,7 @@
       - "protoc"
 
   - id: moblab_common
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -178,7 +178,7 @@
       - "python-3.8"
 
   - id: moblab_db_setup
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -198,7 +198,7 @@
       - "python-3.8"
 
   - id: autotest-lucifer
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -220,7 +220,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: autotest-base
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -245,7 +245,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: autotest-afe
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -265,7 +265,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: autotest-dbsetup
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -285,7 +285,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: autotest-monitor
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -307,7 +307,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: autotest-host
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -327,7 +327,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: autotest-abort
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -348,7 +348,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: db
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -368,7 +368,7 @@
       - "mariadb"
 
   - id: db-init
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -388,7 +388,7 @@
       - "buster-slim"
 
   - id: devserver
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -410,7 +410,7 @@
       - "chromite"
 
   - id: ui
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -432,7 +432,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: ssp
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -454,7 +454,7 @@
       - "chromite"
 
   - id: offloader
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -477,7 +477,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: envoy
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -497,7 +497,7 @@
       - "envoyproxy"
 
   - id: remote-agent
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -519,7 +519,7 @@
       - "moblab_common"
 
   - id: remote-scheduler
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -541,7 +541,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: infra-protos
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -563,7 +563,7 @@
       - "alpine-git"
 
   - id: rpcserver
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -586,7 +586,7 @@
       - "DOCKER_BUILDKIT=1"
 
   - id: compose
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -633,7 +633,7 @@
       - "docker-compose"
 
   - id: mobmonitor
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -655,7 +655,7 @@
       - "moblab_common"
 
   - id: dns
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -675,7 +675,7 @@
       - "alpine-edge"
 
   - id: remote_access
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -698,7 +698,7 @@
       - "moblab_common"
 
   - id: logrotate
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -714,7 +714,7 @@
       - "blacklabelops_logrotate"
 
   - id: dut-manager
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",
@@ -735,7 +735,7 @@
       - "infra-protos"
 
   - id: dut-manager-storage
-    name: "docker:19.03.8"
+    name: "docker:20.10.6"
     args:
       [
         "build",