diff --git a/Makefile b/Makefile
index b824997aef2..2787103a85b 100644
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,8 @@ TELEPORTVENDOR = $(shell find vendor -type f -name '*.go')
 #            a web UI.
 .PHONY: all
 all: $(VERSRC)
-	go install $(BUILDFLAGS) ./lib/...
-	$(MAKE) -s -j 4 $(BINARIES)
+	go install $(BUILDFLAGS) ./lib/... ./tool/...
+	$(MAKE) -s -j 3 $(BINARIES)
 
 $(BUILDDIR)/tctl: $(LIBS) $(TELEPORTSRC) $(TELEPORTVENDOR)
 	go build -o $(BUILDDIR)/tctl -i $(BUILDFLAGS) ./tool/tctl
diff --git a/e b/e
index 8107d6ad675..17e0ce9b971 160000
--- a/e
+++ b/e
@@ -1 +1 @@
-Subproject commit 8107d6ad675485b9b91f6899f41aeb135ab6f3a9
+Subproject commit 17e0ce9b971f97900d510ced15b9fdcd77db6f24