diff --git a/apictl/Godeps/Godeps.json b/apictl/Godeps/Godeps.json
index 4b08d4e5..62b2fcc6 100644
--- a/apictl/Godeps/Godeps.json
+++ b/apictl/Godeps/Godeps.json
@@ -81,11 +81,6 @@
 			"ImportPath": "github.com/mitchellh/mapstructure",
 			"Rev": "740c764bc6149d3f1806231418adb9f52c11bcbf"
 		},
-		{
-			"ImportPath": "github.com/ndslabs/apiserver/types",
-			"Comment": "testing_NDS-269-39-ga11223e",
-			"Rev": "a11223e40a41838a23a61197fa9ea0f66d355635"
-		},
 		{
 			"ImportPath": "github.com/spf13/cast",
 			"Rev": "ee7b3e0353166ab1f3a605294ac8cd2b77953778"
diff --git a/apictl/build.sh b/apictl/build.sh
index 92ea4e4f..5d3c728f 100755
--- a/apictl/build.sh
+++ b/apictl/build.sh
@@ -15,6 +15,7 @@ if [ "$1" = "build" ] || [ -z $1 ]; then
 	echo ")" >> $VERSIONFILE
 	rm -f build/bin/$APP-linux-amd64 build/$APP-darwin-amd64
 	mkdir -p build/bin build/bin build/pkg
+	go get
 	echo Building Darwin
 	GOOS=darwin GOARCH=amd64 go build -o build/bin/$APP-darwin-amd64
 	echo Building Linux
diff --git a/apiserver/Godeps/Godeps.json b/apiserver/Godeps/Godeps.json
index 4b873a80..c34692f4 100644
--- a/apiserver/Godeps/Godeps.json
+++ b/apiserver/Godeps/Godeps.json
@@ -52,8 +52,7 @@
 		},
 		{
 			"ImportPath": "github.com/dgrijalva/jwt-go",
-			"Comment": "v2.4.0-11-gf219341",
-			"Rev": "f2193411bd642f7db03249fd79d5292c9b34916a"
+			"Rev": "f164e17f59b82642a3895ba065c385db6c547344"
 		},
 		{
 			"ImportPath": "github.com/docker/distribution/digest",
diff --git a/apiserver/build.sh b/apiserver/build.sh
index 925d38de..d490fdc4 100755
--- a/apiserver/build.sh
+++ b/apiserver/build.sh
@@ -16,7 +16,8 @@ if [ "$1" = "build" ] || [ -z $1 ]; then
 	rm -f build/bin/$APP-linux-amd64 build/$APP-darwin-amd64
 	mkdir -p build/bin build/bin build/pkg
 	echo Building Darwin
-	GOOS=darwin GOARCH=amd64 go build -o build/bin/$APP-darwin-amd64
+	godep restore
+	GOOS=darwin GOARCH=amd64 godep go build -o build/bin/$APP-darwin-amd64
 	echo Building Linux
 	docker run --rm -it -v `pwd`:/go/src/github.com/ndslabs/apiserver -v `pwd`/build/bin:/go/bin -v `pwd`/build/pkg:/go/pkg -v `pwd`/gobuild.sh:/gobuild.sh golang:1.5  /gobuild.sh