diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 535b8f07a..efe6f72fb 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -49,7 +49,7 @@ changelog:
       - '^test'
       - '^release'
 dockers:
-  - dockerfile: starboard.Dockerfile
+  - dockerfile: build/starboard/Dockerfile
     image_templates:
       - "docker.io/aquasec/starboard:{{ .Version }}"
     binaries:
@@ -63,7 +63,7 @@ dockers:
       - "--label=org.label-schema.build-date={{ .Date }}"
       - "--label=org.label-schema.vcs=https://github.com/aquasecurity/starboard"
       - "--label=org.label-schema.vcs-ref={{ .FullCommit }}"
-  - dockerfile: starboard-operator.Dockerfile
+  - dockerfile: build/starboard-operator/Dockerfile
     image_templates:
       - "docker.io/aquasec/starboard-operator:{{ .Version }}"
     binaries:
@@ -77,7 +77,7 @@ dockers:
       - "--label=org.label-schema.build-date={{ .Date }}"
       - "--label=org.label-schema.vcs=https://github.com/aquasecurity/starboard"
       - "--label=org.label-schema.vcs-ref={{ .FullCommit }}"
-  - dockerfile: starboard-scanner-aqua.Dockerfile
+  - dockerfile: build/scanner-aqua/Dockerfile
     image_templates:
       - "docker.io/aquasec/starboard-scanner-aqua:{{ .Version }}"
     binaries:
diff --git a/Makefile b/Makefile
index dfde4c22d..2a07103c7 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,10 @@ STARBOARD_CLI_IMAGE := aquasec/starboard:$(IMAGE_TAG)
 STARBOARD_OPERATOR_IMAGE := aquasec/starboard-operator:$(IMAGE_TAG)
 STARBOARD_SCANNER_AQUA_IMAGE := aquasec/starboard-scanner-aqua:$(IMAGE_TAG)
 
+.PHONY: all
+all: build
+
+.PHONY: build
 build: build-starboard-cli build-starboard-operator build-starboard-scanner-aqua
 
 ## Builds the starboard binary
@@ -98,17 +102,18 @@ clean:
 	@rm -r ./bin 2> /dev/null || true
 	@rm -r ./dist 2> /dev/null || true
 
+.PHONY: docker-build
 ## Builds Docker images for all binaries
 docker-build: docker-build-starboard-cli docker-build-starboard-operator docker-build-starboard-scanner-aqua
 
 ## Builds Docker image for Starboard CLI
 docker-build-starboard-cli: build-starboard-cli
-	docker build --no-cache -t $(STARBOARD_CLI_IMAGE) -f starboard.Dockerfile bin
+	docker build --no-cache -t $(STARBOARD_CLI_IMAGE) -f build/starboard/Dockerfile bin
 
 ## Builds Docker image for Starboard operator
 docker-build-starboard-operator: build-starboard-operator
-	docker build --no-cache -t $(STARBOARD_OPERATOR_IMAGE) -f starboard-operator.Dockerfile bin
+	docker build --no-cache -t $(STARBOARD_OPERATOR_IMAGE) -f build/starboard-operator/Dockerfile bin
 
 ## Builds Docker image for Aqua scanner
 docker-build-starboard-scanner-aqua: build-starboard-scanner-aqua
-	docker build --no-cache -t $(STARBOARD_SCANNER_AQUA_IMAGE) -f starboard-scanner-aqua.Dockerfile bin
+	docker build --no-cache -t $(STARBOARD_SCANNER_AQUA_IMAGE) -f build/scanner-aqua/Dockerfile bin
diff --git a/README.md b/README.md
index f371dfdd3..9f049ac03 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,12 @@
 
 [![GitHub Release][release-img]][release]
 [![GitHub Build Actions][build-action-img]][actions]
-[![GitHub Release Action][release-action-img]][actions]
 [![Coverage Status][cov-img]][cov]
 [![Go Report Card][report-card-img]][report-card]
 [![License][license-img]][license]
 [![GitHub All Releases][github-all-releases-img]][release]
 ![Docker Pulls Starboard][docker-pulls-starboard]
+![Docker Pulls Starboard Operator][docker-pulls-starboard-operator]
 
 ## Table of Contents
 
@@ -523,7 +523,6 @@ To open this pane on your Mac, choose Apple menu > System Preferences, click Sec
 [release-img]: https://img.shields.io/github/release/aquasecurity/starboard.svg?logo=github
 [release]: https://github.com/aquasecurity/starboard/releases
 [build-action-img]: https://github.com/aquasecurity/starboard/workflows/build/badge.svg
-[release-action-img]: https://github.com/aquasecurity/starboard/workflows/release/badge.svg
 [actions]: https://github.com/aquasecurity/starboard/actions
 [cov-img]: https://codecov.io/github/aquasecurity/starboard/branch/master/graph/badge.svg
 [cov]: https://codecov.io/github/aquasecurity/starboard
@@ -533,6 +532,7 @@ To open this pane on your Mac, choose Apple menu > System Preferences, click Sec
 [license]: https://github.com/aquasecurity/starboard/blob/master/LICENSE
 [github-all-releases-img]: https://img.shields.io/github/downloads/aquasecurity/starboard/total?logo=github
 [docker-pulls-starboard]: https://img.shields.io/docker/pulls/aquasec/starboard?logo=docker&label=docker%20pulls%20%2F%20starboard
+[docker-pulls-starboard-operator]: https://img.shields.io/docker/pulls/aquasec/starboard-operator?logo=docker&label=docker%20pulls%20%2F%20starboard%20operator
 
 [aqua-starboard-blog]: https://blog.aquasec.com/starboard-kubernetes-tools
 [discussions]: https://github.com/aquasecurity/starboard/discussions
diff --git a/starboard-scanner-aqua.Dockerfile b/build/scanner-aqua/Dockerfile
similarity index 100%
rename from starboard-scanner-aqua.Dockerfile
rename to build/scanner-aqua/Dockerfile
diff --git a/starboard-operator.Dockerfile b/build/starboard-operator/Dockerfile
similarity index 100%
rename from starboard-operator.Dockerfile
rename to build/starboard-operator/Dockerfile
diff --git a/starboard.Dockerfile b/build/starboard/Dockerfile
similarity index 100%
rename from starboard.Dockerfile
rename to build/starboard/Dockerfile