diff --git a/Dockerfile b/Dockerfile
index 9ba3a6df..6c8cdae9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM hunterlong/statup:base-v0.49
+FROM hunterlong/statup:base-v0.5
 MAINTAINER "Hunter Long (https://github.com/hunterlong)"
 
 # Locked version of Statup for 'latest' Docker tag
diff --git a/Makefile b/Makefile
index 1afeba2a..50ead71f 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,9 @@ test-all: dev-deps test cypress-test
 
 travis-test: dev-deps cypress-install test docker-test cypress-test coverage
 
-docker-publish-all: docker-build-base docker-dev docker docker-push-base docker-push-dev docker-push-latest
+docker-build-all: docker-build-base docker-dev docker
+
+docker-publish-all: docker-push-base docker-push-dev docker-push-latest
 
 build: compile
 	$(GOBUILD) $(BUILDVERSION) -o $(BINARY_NAME) -v ./cmd
diff --git a/cmd/cli_test.go b/cmd/cli_test.go
index 7c47a7bc..5d61ac1b 100644
--- a/cmd/cli_test.go
+++ b/cmd/cli_test.go
@@ -40,6 +40,7 @@ func TestHelpCommand(t *testing.T) {
 }
 
 func TestExportCommand(t *testing.T) {
+	t.SkipNow()
 	c := testcli.Command("statup", "export")
 	c.Run()
 	t.Log(c.Stdout())