diff --git a/Makefile b/Makefile
index c71f4d0e7..dca94ecbe 100644
--- a/Makefile
+++ b/Makefile
@@ -345,18 +345,17 @@ uninstall:
 	@echo "$(WHALE) $@"
 	@rm -f $(addprefix $(DESTDIR)/bin/,$(notdir $(BINARIES)))
 
-#TODO(mikebrow): refactor install-critools and install-cni to work for local host and for release
 ifeq ($(GOOS),windows)
 install-deps:
 	script/setup/install-runc
-	#script/setup/install-critools
-	#script/setup/install-cni-windows
+	script/setup/install-critools
+	script/setup/install-cni-windows
 else
 install-deps: ## install cri dependencies
 	script/setup/install-seccomp
 	script/setup/install-runc
-	#script/setup/install-critools
-	#script/setup/install-cni
+	script/setup/install-critools
+	script/setup/install-cni
 endif
 
 coverage: ## generate coverprofiles from the unit tests, except tests that require root
diff --git a/script/setup/install-cni b/script/setup/install-cni
index 7f2eb8b3a..34461958d 100755
--- a/script/setup/install-cni
+++ b/script/setup/install-cni
@@ -25,8 +25,9 @@ CNI_COMMIT=$(grep containernetworking/plugins "$GOPATH"/src/github.com/container
 CNI_DIR=${DESTDIR:=''}/opt/cni
 CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
 
-git clone https://github.com/containernetworking/plugins.git "$GOPATH"/src/github.com/containernetworking/plugins
-cd "$GOPATH"/src/github.com/containernetworking/plugins
+TMPROOT=$(mktemp -d)
+git clone https://github.com/containernetworking/plugins.git "${TMPROOT}"/plugins
+pushd "${TMPROOT}"/plugins
 git checkout $CNI_COMMIT
 ./build_linux.sh
 mkdir -p $CNI_DIR
@@ -66,3 +67,6 @@ cat << EOF | tee $CNI_CONFIG_DIR/10-containerd-net.conflist
   ]
 }
 EOF
+
+popd
+rm -fR "${TMPROOT}"
diff --git a/script/setup/install-critools b/script/setup/install-critools
index 88cdb4773..058c2d2d5 100755
--- a/script/setup/install-critools
+++ b/script/setup/install-critools
@@ -24,11 +24,16 @@ cd "$GOPATH"
 go get -u github.com/onsi/ginkgo/ginkgo
 CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627
 
-git clone https://github.com/kubernetes-sigs/cri-tools.git "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
-cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools
+TMPROOT=$(mktemp -d)
+git clone https://github.com/kubernetes-sigs/cri-tools.git "${TMPROOT}"/cri-tools
+pushd "${TMPROOT}"/cri-tools
 git checkout "$CRITEST_COMMIT"
 make
 make install -e BINDIR=${DESTDIR:=''}/usr/local/bin
+
 cat << EOF | tee ${DESTDIR}/etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
+
+popd
+rm -fR "${TMPROOT}"