diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 803d8a77f..e12139d69 100755
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,2 @@
-This project is governed by [Lyft's code of
-conduct](https://github.com/lyft/code-of-conduct). All contributors
-and participants agree to abide by its terms.
+This project is governed by LF AI Foundation's [code of conduct](https://lfprojects.org/policies/code-of-conduct/). 
+All contributors and participants agree to abide by its terms.
diff --git a/boilerplate/flyte/code_of_conduct/CODE_OF_CONDUCT.md b/boilerplate/flyte/code_of_conduct/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..e12139d69
--- /dev/null
+++ b/boilerplate/flyte/code_of_conduct/CODE_OF_CONDUCT.md
@@ -0,0 +1,2 @@
+This project is governed by LF AI Foundation's [code of conduct](https://lfprojects.org/policies/code-of-conduct/). 
+All contributors and participants agree to abide by its terms.
diff --git a/boilerplate/flyte/code_of_conduct/README.rst b/boilerplate/flyte/code_of_conduct/README.rst
new file mode 100644
index 000000000..0c9f2f1ec
--- /dev/null
+++ b/boilerplate/flyte/code_of_conduct/README.rst
@@ -0,0 +1,2 @@
+CODE OF CONDUCT
+~~~~~~~~~~~~~~~
diff --git a/boilerplate/flyte/code_of_conduct/update.sh b/boilerplate/flyte/code_of_conduct/update.sh
new file mode 100755
index 000000000..42f615846
--- /dev/null
+++ b/boilerplate/flyte/code_of_conduct/update.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES.
+# ONLY EDIT THIS FILE FROM WITHIN THE 'FLYTEORG/BOILERPLATE' REPOSITORY:
+# 
+# TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst
+
+set -e
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+
+cp ${DIR}/CODE_OF_CONDUCT.md ${DIR}/../../../CODE_OF_CONDUCT.md
diff --git a/boilerplate/flyte/golang_test_targets/goimports b/boilerplate/flyte/golang_test_targets/goimports
index ba0d6d871..af1829036 100755
--- a/boilerplate/flyte/golang_test_targets/goimports
+++ b/boilerplate/flyte/golang_test_targets/goimports
@@ -5,4 +5,4 @@
 # 
 # TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst
 
-goimports -w $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./pkg/client/*")
+goimports -w $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./pkg/client/*" -not -path "./boilerplate/*")
diff --git a/boilerplate/update.cfg b/boilerplate/update.cfg
index 6eb17e23c..98e151d74 100755
--- a/boilerplate/update.cfg
+++ b/boilerplate/update.cfg
@@ -3,3 +3,4 @@ flyte/golang_support_tools
 flyte/pull_request_template
 flyte/docker_build
 flyte/welcome_bot
+flyte/code_of_conduct