diff --git a/aks-terraform/Makefile b/aks-terraform/Makefile
deleted file mode 100644
index 06a75e8..0000000
--- a/aks-terraform/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= aks-terraform
-
-.PHONY: docker-build
-docker-build:
-	docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/aks/cnab/Dockerfile b/aks/Dockerfile
similarity index 100%
rename from aks/cnab/Dockerfile
rename to aks/Dockerfile
diff --git a/ansible-azurevm/Makefile b/ansible-azurevm/Makefile
deleted file mode 100644
index 85f7f58..0000000
--- a/ansible-azurevm/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= ansible-azurevm
-
-.PHONY: docker-build
-docker-build:
-	docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/ansiblebase/Makefile b/ansiblebase/Makefile
deleted file mode 100644
index ab925fc..0000000
--- a/ansiblebase/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= ansiblebase
-
-.PHONY: docker-build
-docker-build:
-	docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/arm-aci/Makefile b/arm-aci/Makefile
deleted file mode 100644
index af49a18..0000000
--- a/arm-aci/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-.PHONY: docker-build
-docker-build:
-	docker build -t cnab/arm-aci:0.1.0 .
\ No newline at end of file
diff --git a/armbase/Makefile b/armbase/Makefile
index 5ce7e51..66c24bc 100644
--- a/armbase/Makefile
+++ b/armbase/Makefile
@@ -25,14 +25,9 @@ build:
 cxbuild:
 	GOOS=linux GOARCH=amd64 go build $(GOFLAGS) -o cnab/app/armup -ldflags '$(LDFLAGS)' ./...
 
-.PHONY: docker-build
-docker-build: cxbuild
-docker-build:
-	docker build -t cnab/armbase:0.1.0 .
-	docker tag cnab/armbase:0.1.0 cnab/armbase:latest
-
-docker-push:
-	docker push cnab/armbase
+# Note: to build/push the Docker image for this bundle,
+# call the root Makefile's targets from the root of this project , e.g.
+# BUNDLE=armbase make docker-build
 
 .PHONY: test
 test:
diff --git a/compose/Makefile b/compose/Makefile
deleted file mode 100644
index 72fd4d3..0000000
--- a/compose/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= compose
-
-.PHONY: docker-build
-docker-build:
-	docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/helloazure/cnab/bundle.json b/helloazure/bundle.json
similarity index 100%
rename from helloazure/cnab/bundle.json
rename to helloazure/bundle.json
diff --git a/helloworld/Makefile b/helloworld/Makefile
deleted file mode 100644
index f2efe58..0000000
--- a/helloworld/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= 0.1.1
-REPO ?= cnab
-IMG ?= helloworld
-
-.PHONY: docker-build
-docker-build:
-	cd cnab && docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/k8sbase/Makefile b/k8sbase/Makefile
deleted file mode 100644
index ba4a06e..0000000
--- a/k8sbase/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= k8sbase
-
-.PHONY: docker-build
-docker-build:
-	docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/makebase/Makefile b/makebase/Makefile
deleted file mode 100644
index f62b430..0000000
--- a/makebase/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= makebase
-
-.PHONY: docker-build
-docker-build:
-	docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/pulumibase/Makefile b/pulumibase/Makefile
deleted file mode 100644
index 8488709..0000000
--- a/pulumibase/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= pulumi
-
-.PHONY: docker-build
-docker-build:
-	docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
diff --git a/terraform/Makefile b/terraform/Makefile
deleted file mode 100644
index 2a1c144..0000000
--- a/terraform/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= terraform
-
-.PHONY: docker-build
-docker-build:
-	docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/wordpress-mysql/cnab/Dockerfile b/wordpress-mysql/Dockerfile
similarity index 100%
rename from wordpress-mysql/cnab/Dockerfile
rename to wordpress-mysql/Dockerfile
diff --git a/wordpress-mysql/Makefile b/wordpress-mysql/Makefile
deleted file mode 100644
index 4a1c082..0000000
--- a/wordpress-mysql/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= wordpress-mysql
-
-.PHONY: docker-build
-docker-build:
-	cd cnab && docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file
diff --git a/wordpress/cnab/Dockerfile b/wordpress/Dockerfile
similarity index 100%
rename from wordpress/cnab/Dockerfile
rename to wordpress/Dockerfile
diff --git a/wordpress/Makefile b/wordpress/Makefile
deleted file mode 100644
index a6d0572..0000000
--- a/wordpress/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION ?= latest
-REPO ?= cnab
-IMG ?= wordpress
-
-.PHONY: docker-build
-docker-build:
-	cd cnab && docker build -t $(REPO)/$(IMG):$(VERSION) .
-
-.PHONY: docker-run
-docker-run: docker-build
-docker-run:
-	docker run -t $(REPO)/$(IMG):$(VERSION)
\ No newline at end of file