diff --git a/Dockerfile b/Dockerfile
index 20170e420..db864ed81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,7 @@ COPY . ./
 COPY --from=lattice-builder /lattice/build /lattice
 RUN /go/bin/statik -src=/lattice -dest=/pilosa
 
-RUN make build FLAGS="-o build/pilosa" ${MAKE_FLAGS}
+RUN make build FLAGS="-o build/featurebase" ${MAKE_FLAGS}
 
 #####################
 ### Pilosa runner ###
@@ -40,7 +40,7 @@ LABEL maintainer "dev@molecula.com"
 
 RUN apk add --no-cache curl jq
 
-COPY --from=pilosa-builder /pilosa/build/pilosa /
+COPY --from=pilosa-builder /pilosa/build/featurebase /
 
 COPY LICENSE /LICENSE
 COPY NOTICE /NOTICE
diff --git a/Dockerfile.pilosa b/Dockerfile.pilosa
index 068279d14..c830a8862 100644
--- a/Dockerfile.pilosa
+++ b/Dockerfile.pilosa
@@ -10,7 +10,7 @@ WORKDIR /pilosa
 
 COPY . ./
 
-RUN make build FLAGS="-o build/pilosa" ${MAKE_FLAGS}
+RUN make build FLAGS="-o build/featurebase" ${MAKE_FLAGS}
 
 #####################
 ### Pilosa runner ###
@@ -22,7 +22,7 @@ LABEL maintainer "dev@molecula.com"
 
 RUN apk add --no-cache curl jq
 
-COPY --from=pilosa-builder /pilosa/build/pilosa /
+COPY --from=pilosa-builder /pilosa/build/featurebase /
 
 COPY LICENSE /LICENSE
 COPY NOTICE /NOTICE
diff --git a/Dockerfile.runner b/Dockerfile.runner
index 3b1be7fd9..12f49e13c 100644
--- a/Dockerfile.runner
+++ b/Dockerfile.runner
@@ -10,7 +10,7 @@ WORKDIR /pilosa
 
 COPY . ./
 
-RUN make build FLAGS="-o build/pilosa" ${MAKE_FLAGS}
+RUN make build FLAGS="-o build/featurebase" ${MAKE_FLAGS}
 
 FROM moleculacorp/idk as idk
 LABEL maintainer "dev@molecula.com"
@@ -18,6 +18,6 @@ RUN apt-get update -y
 RUN apt-get install -y bash curl jq
 
 
-COPY --from=pilosa-builder /pilosa/build/pilosa /
+COPY --from=pilosa-builder /pilosa/build/featurebase /
 COPY testBackupRestore.sh /
 CMD ["bash","/testBackupRestore.sh"]
diff --git a/Makefile b/Makefile
index 335685187..d56d9d284 100644
--- a/Makefile
+++ b/Makefile
@@ -216,13 +216,13 @@ docker-build: vendor
 	    --build-arg GO_VERSION=$(GO_VERSION) \
 	    --build-arg MAKE_FLAGS="TRIAL_DEADLINE=$(TRIAL_DEADLINE) GOOS=$(GOOS) GOARCH=$(GOARCH)" \
 	    --target pilosa-builder \
-	    --tag pilosa:build .
-	docker create --name pilosa-build pilosa:build
-	mkdir -p build/pilosa-$(VERSION_ID)
-	docker cp pilosa-build:/pilosa/build/. ./build/pilosa-$(VERSION_ID)
-	cp NOTICE LICENSE ./build/pilosa-$(VERSION_ID)
-	docker rm pilosa-build
-	tar -cvz -C build -f build/pilosa-$(VERSION_ID).tar.gz pilosa-$(VERSION_ID)/
+	    --tag featurebase:build .
+	docker create --name featurebase-build featurebase:build
+	mkdir -p build/featurebase-$(VERSION_ID)
+	docker cp featurebase-build:/pilosa/build/. ./build/featurebase-$(VERSION_ID)
+	cp NOTICE LICENSE ./build/featurebase-$(VERSION_ID)
+	docker rm featurebase-build
+	tar -cvz -C build -f build/featurebase-$(VERSION_ID).tar.gz featurebase-$(VERSION_ID)/
 
 # Create Docker image from Dockerfile
 docker-image: vendor
diff --git a/docker-compose-3.yml b/docker-compose-3.yml
index ef31424d0..1998fcf97 100644
--- a/docker-compose-3.yml
+++ b/docker-compose-3.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   pilosa0:
-    image: build/pilosa                                                                                                                                                     
+    image: build/featurebase                                                                                                                                                     
     build:                                                                                                                                                                 
       context: .                                                                                                                                                           
       dockerfile: Dockerfile.pilosa              
@@ -25,7 +25,7 @@ services:
       timeout: 5s
       retries: 5
   pilosa1:
-    image: build/pilosa                                                                                                                                                     
+    image: build/featurebase                                                                                                                                                     
     build:                                                                                                                                                                 
       context: .                                                                                                                                                           
       dockerfile: Dockerfile.pilosa              
@@ -44,7 +44,7 @@ services:
     volumes:
     - data:/data
   pilosa2:
-    image: build/pilosa                                                                                                                                                     
+    image: build/featurebase                                                                                                                                                     
     build:                                                                                                                                                                 
       context: .                                                                                                                                                           
       dockerfile: Dockerfile.pilosa              
@@ -63,7 +63,7 @@ services:
     volumes:
     - data:/data
   pilosax:
-    image: build/pilosa                                                                                                                                                     
+    image: build/featurebase                                                                                                                                                     
     build:                                                                                                                                                                 
       context: .                                                                                                                                                           
       dockerfile: Dockerfile.pilosa