diff --git a/docs/providers-guide.md b/docs/providers-guide.md
index 2017790d7..dcab56f4e 100644
--- a/docs/providers-guide.md
+++ b/docs/providers-guide.md
@@ -230,6 +230,7 @@ Provider type: `codebuild`.
   > pipeline to consume a custom image if required.
   > Along with `repository_arn`, we also support a `tag` key which can be used
   > to define which image should be used (defaults to `latest`).
+  > An example of this setup is provided [here](https://github.com/awslabs/aws-deployment-framework/blob/master/docs/user-guide.md#custom-build-images).
 - *size* *(String)* **(small|medium|large)** - default: `small`.
   > The Compute type to use for the build, types can be found
   > [here](https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html).
diff --git a/docs/user-guide.md b/docs/user-guide.md
index e0a569a52..97337c452 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -314,7 +314,7 @@ pipelines:
         provider: codebuild
         image:
           repository_arn: arn:aws:ecr:region:012345678910:repository/test
-          tag: latest #optional (and also defaults to latest)
+          tag: latest # optional (defaults to latest)
     targets:
       - ...
 ```
diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/schema_validation.py b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/schema_validation.py
index d4ab0306f..90d22dad9 100644
--- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/schema_validation.py
+++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/schema_validation.py
@@ -99,7 +99,7 @@
 # CodeBuild
 CODEBUILD_IMAGE_PROPS = {
     "repository_arn": str, # arn:aws:ecr:region:012345678910:repository/test
-    Optional("tags"): dict,
+    Optional("tag"): str,  # defaults to latest
 }
 CODEBUILD_PROPS = {
     Optional("image"): Or(str, CODEBUILD_IMAGE_PROPS),