diff --git a/.circleci/config.yml b/.circleci/config.yml
index 392c90a..14cf9fe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,15 +39,17 @@ jobs:
     docker:
       - image: circleci/golang:latest
     steps:
-      - run: mkdir -p release/bin/darwin
-      - run: mkdir -p release/bin/linux
+      - run: mkdir -p artifacts
       - attach_workspace:
-          at: release
+          at: artifacts
       - run:
           name: "Publish Release on GitHub"
           command: |
             go get github.com/tcnksm/ghr
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} release/bin/
+            mkdir -p release
+            cp artifacts/bin/linux/* release/
+            cp artifacts/bin/darwin/* release/
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} release/
 workflows:
   version: 2
   build:
diff --git a/Makefile b/Makefile
index 9cf65f6..5b3ea32 100644
--- a/Makefile
+++ b/Makefile
@@ -30,10 +30,10 @@ update-fonts: install-tools
 
 .PHONY:	build-linux
 build-linux:
-	mkdir -p release/bin/linux
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -o bin/${BINARY}-linux-amd64 -ldflags "-X main.Version=`${CIRCLE_TAG}`"
+	mkdir -p bin/linux
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -o bin/linux/${BINARY}-linux-amd64 -ldflags "-X main.Version=`${CIRCLE_TAG}`"
 
 .PHONY:	build-darwin
 build-darwin:
-	mkdir -p release/bin/darwin
+	mkdir -p bin/darwin
 	xgo -ldflags "-X main.Version=`${CIRCLE_TAG}`" --targets=darwin/amd64 --dest=bin/darwin -out ${BINARY}-darwin-amd64 .