diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3d249e1..4b9802f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,15 +45,17 @@ jobs:
 
       - name: Checkout Dockerized
         uses: actions/checkout@v2
+        with:
+          path: dockerized
 
-      - run: bin/dockerized --help
+      - run: dockerized/bin/dockerized --help
         shell: bash
 
-      - run: bin/dockerized go version
+      - run: dockerized/bin/dockerized go version
         shell: bash
 
       - name: "Test: version from environment variable"
-        run: GO_VERSION=1.16.15 bin/dockerized go version | grep "go1.16.15"
+        run: GO_VERSION=1.16.15 dockerized/bin/dockerized go version | grep "go1.16.15"
         shell: bash
 
       - name: "Test: version from dockerized.env"
@@ -61,9 +63,12 @@ jobs:
           mkdir -p project
           cd project
           echo 'GO_VERSION=1.17.8' > dockerized.env
-          ../bin/dockerized go version | grep "1.17.8"
+          ../dockerized/bin/dockerized go version | grep "1.17.8"
         shell: bash
 
+      - name: "Test: command that requires building (protoc)"
+        run: dockerized/bin/dockerized protoc --version
+        shell: bash
 
       # region windows
       - if: runner.os == 'windows'
diff --git a/lib/dockerized.go b/lib/dockerized.go
index 9a7900a..0b6d8e1 100644
--- a/lib/dockerized.go
+++ b/lib/dockerized.go
@@ -49,14 +49,14 @@ func main() {
 
 	dockerizedRoot := getDockerizedRoot()
 	dockerizedDockerComposeFilePath := os.Getenv("COMPOSE_FILE")
-	if dockerizedDockerComposeFilePath != "" {
-		if optionVerbose {
-			fmt.Println("COMPOSE_FILE: ", dockerizedDockerComposeFilePath)
-		}
-	} else {
+	if dockerizedDockerComposeFilePath == "" {
 		dockerizedDockerComposeFilePath = filepath.Join(dockerizedRoot, "docker-compose.yml")
 	}
 
+	if optionVerbose {
+		fmt.Println("Dockerized docker-compose file: ", dockerizedDockerComposeFilePath)
+	}
+
 	if commandName == "" || optionHelp {
 		err := help(dockerizedDockerComposeFilePath)
 		if err != nil {
@@ -356,6 +356,10 @@ func getBackend() (*api.ServiceProxy, error) {
 
 func dockerComposeBuild(dockerComposeFilePath string, buildOptions api.BuildOptions) error {
 	project, err := getProject(dockerComposeFilePath)
+	err = os.Chdir(project.WorkingDir)
+	if err != nil {
+		return err
+	}
 	if err != nil {
 		return err
 	}
@@ -369,6 +373,10 @@ func dockerComposeBuild(dockerComposeFilePath string, buildOptions api.BuildOpti
 }
 
 func dockerComposeRun(project *types.Project, runOptions api.RunOptions, volumes []types.ServiceVolumeConfig) error {
+	err := os.Chdir(project.WorkingDir)
+	if err != nil {
+		return err
+	}
 	ctx, _ := newSigContext()
 
 	serviceName := runOptions.Service