diff --git a/.gitignore b/.gitignore
index 9bf572296..82a553aed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ vendor
 .DS_Store
 build
 *~
-lattice
 release-pilosa-fsck.*.*.tar.gz
 /log.*
 /tourna.log.*
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..afb2db2d6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lattice"]
+	path = lattice
+	url = git@github.com:molecula/lattice.git
diff --git a/Makefile b/Makefile
index 9114fda54..a1b80b5b8 100644
--- a/Makefile
+++ b/Makefile
@@ -155,11 +155,17 @@ install:
 install-bench:
 	go install -tags='$(BUILD_TAGS)' -ldflags $(LDFLAGS) $(FLAGS) ./cmd/pilosa-bench
 
+# Ensure lattice is cloned and the pinned version is checked out
 lattice:
-	git clone git@github.com:molecula/lattice.git
+	git submodule update --init
 
+# Build the lattice assets
 build-lattice: lattice require-yarn
-	cd lattice && git pull && yarn install && yarn build
+	cd lattice && yarn install && yarn build
+
+# Upgrade lattice to the latest version
+upgrade-lattice: lattice
+	git submodule update --remote
 
 # `go generate` protocol buffers
 generate-protoc: require-protoc require-protoc-gen-gofast
diff --git a/lattice b/lattice
new file mode 160000
index 000000000..36f453c1e
--- /dev/null
+++ b/lattice
@@ -0,0 +1 @@
+Subproject commit 36f453c1ea3bf86c546a8ad4a88f2a926724d683