diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index bcfa5d03520..482680c59d9 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-e1fa9ea1482a511d83103ae7d1a0e5ebb3c5a15f
+a4a4e10c008e198f4ebf424cb21f6903436bfea9
diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk
index 0d0f3fbf5e5..52c4c9abb21 100644
--- a/common/Makefile.common.mk
+++ b/common/Makefile.common.mk
@@ -28,9 +28,8 @@ lint-dockerfiles:
 lint-scripts:
 	@${FINDFILES} -name '*.sh' -print0 | ${XARGS} shellcheck
 
-# TODO(nmittler): disabled pipefail due to grep failing when no files contain "{{". Need to investigate options.
 lint-yaml:
-	@set +o pipefail; ${FINDFILES} \( -name '*.yml' -o -name '*.yaml' \) -print0 | ${XARGS} grep -L -e "{{" | xargs -r yamllint -c ./common/config/.yamllint.yml
+	@${FINDFILES} \( -name '*.yml' -o -name '*.yaml' \) -print0 | ${XARGS} grep -L -e "{{" | xargs -r yamllint -c ./common/config/.yamllint.yml
 
 lint-helm:
 	@${FINDFILES} -name 'Chart.yaml' -print0 | ${XARGS} -L 1 dirname | xargs -r helm lint --strict
@@ -64,8 +63,8 @@ lint-typescript:
 lint-protos:
 	@if test -d common-protos; then $(FINDFILES) -name '*.proto' -print0 | $(XARGS) -L 1 prototool lint --protoc-bin-path=/usr/bin/protoc --protoc-wkt-path=common-protos; fi
 
-lint-licenses: mod-download-go
-	@license-lint --config common/config/license-lint.yml
+lint-licenses:
+	@if test -d licenses; then license-lint --config common/config/license-lint.yml; fi
 
 lint-all: lint-dockerfiles lint-scripts lint-yaml lint-helm lint-copyright-banner lint-go lint-python lint-markdown lint-sass lint-typescript lint-protos lint-licenses
 
diff --git a/common/config/.yamllint.yml b/common/config/.yamllint.yml
index 87fc4e6a632..c2f21b58189 100644
--- a/common/config/.yamllint.yml
+++ b/common/config/.yamllint.yml
@@ -15,7 +15,7 @@ rules:
   document-end: disable
   document-start: disable
   empty-lines: disable
-  empty-values: enable
+  empty-values: disable
   hyphens: enable
   indentation: disable
   key-duplicates: enable
@@ -23,7 +23,7 @@ rules:
   line-length: disable
   new-line-at-end-of-file: disable
   new-lines: enable
-  octal-values: enable
+  octal-values: disable
   quoted-strings: disable
   trailing-spaces: disable
   truthy: disable