diff --git a/.gitignore b/.gitignore
index 1e5d4a5..a1f9774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
-# TODO (crozzy): once claircore PRs are merged, add vendor and build
 /matcher.db
 /tmp
 /feeds
 /reports
 /vendor
-clair-action
+/clair-action
diff --git a/Makefile b/Makefile
index 7d4240f..f128679 100644
--- a/Makefile
+++ b/Makefile
@@ -8,4 +8,4 @@ vendor/modules.txt: go.mod
 build: clair-action
 
 clair-action: vendor
-	go build -o clair-action ./cmd/...
+	go build ./cmd/...
diff --git a/cli.Dockerfile b/cli.Dockerfile
index 052289a..13be1b1 100644
--- a/cli.Dockerfile
+++ b/cli.Dockerfile
@@ -9,7 +9,7 @@ RUN go build \
     -o clair-action \
     -trimpath \
     -ldflags="-s -w$(test -n "${CLAIR_ACTION_VERSION}" && printf " -X 'main.Version=%s'" "${CLAIR_ACTION_VERSION}")" \
-    ./cmd/cli
+    ./cmd/clair-action
 
 # Final image
 FROM registry.access.redhat.com/ubi8/ubi-minimal as final
diff --git a/cmd/cli/fetcher.go b/cmd/clair-action/fetcher.go
similarity index 100%
rename from cmd/cli/fetcher.go
rename to cmd/clair-action/fetcher.go
diff --git a/cmd/cli/fetcher_test.go b/cmd/clair-action/fetcher_test.go
similarity index 100%
rename from cmd/cli/fetcher_test.go
rename to cmd/clair-action/fetcher_test.go
diff --git a/cmd/cli/main.go b/cmd/clair-action/main.go
similarity index 100%
rename from cmd/cli/main.go
rename to cmd/clair-action/main.go
diff --git a/cmd/cli/report.go b/cmd/clair-action/report.go
similarity index 100%
rename from cmd/cli/report.go
rename to cmd/clair-action/report.go
diff --git a/cmd/cli/tmp_locallock.go b/cmd/clair-action/tmp_locallock.go
similarity index 100%
rename from cmd/cli/tmp_locallock.go
rename to cmd/clair-action/tmp_locallock.go
diff --git a/cmd/cli/update.go b/cmd/clair-action/update.go
similarity index 100%
rename from cmd/cli/update.go
rename to cmd/clair-action/update.go
diff --git a/cmd/cli/version.go b/cmd/clair-action/version.go
similarity index 100%
rename from cmd/cli/version.go
rename to cmd/clair-action/version.go