diff --git a/Makefile b/Makefile
index c6b8ced..6074710 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,13 @@ main:
 
 image: main
 	cp $(GOBIN)/pgo-osb .
-	docker build -t pgo-osb -f $(OSB_BASEOS)/Dockerfile.pgo-osb.$(OSB_BASEOS) .
-	docker tag pgo-osb $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG)
+	sudo --preserve-env buildah bud --squash -f $(OSB_ROOT)/$(OSB_BASEOS)/Dockerfile.pgo-osb.$(OSB_BASEOS) -t $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG) $(OSB_ROOT)
+	sudo --preserve-env buildah push $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG) docker-daemon:$(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG)
+
 push:
 	docker push $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG)
 
+
 deploy:
 	cd deploy && ./deploy.sh
 
diff --git a/Makefile.buildah b/Makefile.docker
similarity index 77%
rename from Makefile.buildah
rename to Makefile.docker
index 7efd27d..c6b8ced 100644
--- a/Makefile.buildah
+++ b/Makefile.docker
@@ -15,15 +15,11 @@ main:
 
 image: main
 	cp $(GOBIN)/pgo-osb .
-#	docker build -t pgo-osb -f $(OSB_BASEOS)/Dockerfile.pgo-osb.$(OSB_BASEOS) .
-#	docker tag pgo-osb $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG)
-	sudo --preserve-env buildah bud --squash -f $(OSB_ROOT)/$(OSB_BASEOS)/Dockerfile.pgo-osb.$(OSB_BASEOS) -t $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG) $(OSB_ROOT)
-	sudo --preserve-env buildah push $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG) docker-daemon:$(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG)
-
+	docker build -t pgo-osb -f $(OSB_BASEOS)/Dockerfile.pgo-osb.$(OSB_BASEOS) .
+	docker tag pgo-osb $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG)
 push:
 	docker push $(OSB_IMAGE_PREFIX)/pgo-osb:$(OSB_IMAGE_TAG)
 
-
 deploy:
 	cd deploy && ./deploy.sh