diff --git a/azdo-task/README.md b/azdo-task/README.md
index 67dab1bfb..4775fbc8a 100644
--- a/azdo-task/README.md
+++ b/azdo-task/README.md
@@ -73,7 +73,7 @@ In the example above, the devcontainer-build-run will perform the following step
 | subFolder                 | false    | Use this to specify the repo-relative path to the folder containing the dev container (i.e. the folder that contains the `.devcontainer` folder). Defaults to repo root                                                                                          |
 | runCmd                    | true     | The command to run after building the dev container image                                                                                                                                                                                                        |
 | env                       | false    | Specify environment variables to pass to the dev container when run                                                                                                                                                                                              |
-| push                      | false    | One of: `never`, `filter`, `always`. When set to `filter`, the image is pushed if the `sourceBranchFilterForPush`, `buildReasonsForPush`, and `pushOnFailedBuild` conditions are met. Defaults to `filter` if `imageName` is set, `never` otherwise.             |
+| push                      | false    | One of: `never`, `filter`, `always`. When set to `filter`, the image if pushed if the `sourceBranchFilterForPush`, `buildReasonsForPush`, and `pushOnFailedBuild` conditions are met. Defaults to `filter` if `imageName` is set, `never` otherwise.             |
 | pushOnFailedBuild         | false    | If `false` (default), only push if the build is successful. Set to true to push on failed builds                                                                                                                                                                 |
 | sourceBranchFilterForPush | false    | Allows you to limit which branch's builds are pushed to the registry (only specified branches are allowed to push). If empty, all branches are allowed                                                                                                           |
 | buildReasonsForPush       | false    | Allows you to limit the Build.Reason values that are allowed to push to the registry. Defaults to Manual, IndividualCI, BatchedCI. See https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&viewFallbackFrom=vsts&tabs=yaml |
diff --git a/github-tests/Dockerfile/docker-from-docker-non-root/Dockerfile b/github-tests/Dockerfile/docker-from-docker-non-root/Dockerfile
index 83045b37e..4f72ac0e4 100644
--- a/github-tests/Dockerfile/docker-from-docker-non-root/Dockerfile
+++ b/github-tests/Dockerfile/docker-from-docker-non-root/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.0-alpine3.13 as builder
+FROM golang:1.21.3-alpine3.18 as builder
 
 # Install certs, git, and mercurial
 # RUN apk add --no-cache ca-certificates git build-base
diff --git a/github-tests/Dockerfile/docker-from-docker-root/Dockerfile b/github-tests/Dockerfile/docker-from-docker-root/Dockerfile
index 83045b37e..4f72ac0e4 100644
--- a/github-tests/Dockerfile/docker-from-docker-root/Dockerfile
+++ b/github-tests/Dockerfile/docker-from-docker-root/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.0-alpine3.13 as builder
+FROM golang:1.21.3-alpine3.18 as builder
 
 # Install certs, git, and mercurial
 # RUN apk add --no-cache ca-certificates git build-base
diff --git a/github-tests/Dockerfile/feature-docker-from-docker/Dockerfile b/github-tests/Dockerfile/feature-docker-from-docker/Dockerfile
index 83045b37e..4f72ac0e4 100644
--- a/github-tests/Dockerfile/feature-docker-from-docker/Dockerfile
+++ b/github-tests/Dockerfile/feature-docker-from-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.0-alpine3.13 as builder
+FROM golang:1.21.3-alpine3.18 as builder
 
 # Install certs, git, and mercurial
 # RUN apk add --no-cache ca-certificates git build-base