diff --git a/files/Makefile b/files/Makefile
index 869646b82da041c02e9c11411605bbd710be8328..9b46988876effc754cc42f01d32bc1b05778e029 100644
--- a/files/Makefile
+++ b/files/Makefile
@@ -28,10 +28,10 @@ dep:
 	@go get -v ./...
 
 build: dep
-	@gox -output="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}/{{.Dir}}_{{.OS}}_{{.Arch}}" -parallel=6 -osarch '!darwin/386'
+	@gox -output="${CI_PROJECT_DIR}/build/{{.Dir}}_{{.OS}}_{{.Arch}}" -parallel=6 -osarch '!darwin/386'
 
 clean:
-	@rm -rf "${CI_PROJECT_DIR}/${CI_PROJECT_NAME}"
+	@rm -rf "${CI_PROJECT_DIR}/build/"
 
 help:
 	@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
diff --git a/files/templates/matrix.yml b/files/templates/matrix.yml
index 292732a413b10ac2b907d88dfb5182c918f6a859..c97dc79d72762ba2b96692e0f932c65d7f646cec 100644
--- a/files/templates/matrix.yml
+++ b/files/templates/matrix.yml
@@ -36,4 +36,4 @@ build:
     - make
   artifacts:
     paths:
-      - $CI_PROJECT_NAME
+      - build