diff --git a/.gitmodules b/.gitmodules
index b49e5546452f7554ac6fa655259a86034ec0aa0e..ee9ff83760c7ea6c8019b7cc024ae81a7c851792 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,6 @@
 	path = models/openconfig
 	url = https://github.com/openconfig/public.git
     branch = master
+[submodule "forks/google"]
+	path = forks/google
+	url = https://github.com/google/gnxi
diff --git a/.golangci.yml b/.golangci.yml
index 7a4b30bd5c2cf18bddcac4a3c402916003a09bf1..b5c8fb3a790edcad9b9e73ce5baa9096fd07b0ac 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -9,6 +9,7 @@ run:
         - controller/test
         - controller/mocks
         - models/generated/openconfig
+        - forks/
     skip-dirs-default: true
     skip-files:
         - http.go
diff --git a/forks/google b/forks/google
new file mode 160000
index 0000000000000000000000000000000000000000..cd6b043b7fd0b36a25a27289c8d719ee19833329
--- /dev/null
+++ b/forks/google
@@ -0,0 +1 @@
+Subproject commit cd6b043b7fd0b36a25a27289c8d719ee19833329