diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e222673..ef59f915 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,12 +60,12 @@ jobs:
 
       - name: Test
         env:
-          BUILD_TAGS: example,local
+          BUILD_TAGS: example
         run: make -f builder.Makefile test
 
       - name: Build for local E2E
         env:
-          BUILD_TAGS: example,local,e2e
+          BUILD_TAGS: example,e2e
         run: make -f builder.Makefile cli
 
       - name: E2E Test
diff --git a/Makefile b/Makefile
index 4a85885e..c6cff2f3 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ protos: ## Generate go code from .proto files
 cli: ## Compile the cli
 	@docker build . --target cli \
 	--platform local \
-	--build-arg BUILD_TAGS=example,local,e2e \
+	--build-arg BUILD_TAGS=example,e2e \
 	--build-arg GIT_TAG=$(GIT_TAG) \
 	--output ./bin
 
@@ -63,7 +63,7 @@ cross: ## Compile the CLI for linux, darwin and windows
 
 test: ## Run unit tests
 	@docker build . \
-	--build-arg BUILD_TAGS=example,local \
+	--build-arg BUILD_TAGS=example \
 	--build-arg GIT_TAG=$(GIT_TAG) \
 	--target test
 
@@ -72,7 +72,7 @@ cache-clear: ## Clear the builder cache
 
 lint: ## run linter(s)
 	@docker build . \
-	--build-arg BUILD_TAGS=example,local,e2e \
+	--build-arg BUILD_TAGS=example,e2e \
 	--build-arg GIT_TAG=$(GIT_TAG) \
 	--target lint
 
diff --git a/local/backend.go b/local/backend.go
index a97871f3..de0380e1 100644
--- a/local/backend.go
+++ b/local/backend.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/build.go b/local/build.go
index 56ace5cf..5efdc76d 100644
--- a/local/build.go
+++ b/local/build.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/compose.go b/local/compose.go
index 1d8b4430..0a373948 100644
--- a/local/compose.go
+++ b/local/compose.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
@@ -502,7 +500,7 @@ func (s *composeService) Down(ctx context.Context, projectName string) error {
 func (s *composeService) removeContainers(ctx context.Context, w progress.Writer, eg *errgroup.Group, filter filters.Args) error {
 	containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
 		Filters: filter,
-		All: true,
+		All:     true,
 	})
 	if err != nil {
 		return err
diff --git a/local/compose_test.go b/local/compose_test.go
index fa406709..d035875a 100644
--- a/local/compose_test.go
+++ b/local/compose_test.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/container.go b/local/container.go
index 4ebdddee..a82fd8c0 100644
--- a/local/container.go
+++ b/local/container.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/containers.go b/local/containers.go
index 24912e4e..b05e5699 100644
--- a/local/containers.go
+++ b/local/containers.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/convergence.go b/local/convergence.go
index 21a51f79..e62a566f 100644
--- a/local/convergence.go
+++ b/local/convergence.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/convert.go b/local/convert.go
index f0b834a7..2b567f9d 100644
--- a/local/convert.go
+++ b/local/convert.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/convert_test.go b/local/convert_test.go
index 987b6c98..fa93138d 100644
--- a/local/convert_test.go
+++ b/local/convert_test.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/dependencies.go b/local/dependencies.go
index 6d6cc515..ecfe06b4 100644
--- a/local/dependencies.go
+++ b/local/dependencies.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/dependencies_test.go b/local/dependencies_test.go
index 41b31e7e..736bb50c 100644
--- a/local/dependencies_test.go
+++ b/local/dependencies_test.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/labels.go b/local/labels.go
index e0ca6010..2fd388f5 100644
--- a/local/labels.go
+++ b/local/labels.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/util.go b/local/util.go
index c49af75d..6aef2070 100644
--- a/local/util.go
+++ b/local/util.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
diff --git a/local/volumes.go b/local/volumes.go
index 2f56d444..2fbf08b7 100644
--- a/local/volumes.go
+++ b/local/volumes.go
@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors