diff --git a/garden-cli/CHANGELOG.md b/CHANGELOG.md
similarity index 100%
rename from garden-cli/CHANGELOG.md
rename to CHANGELOG.md
diff --git a/bin/publish b/bin/publish
index eb66de87c8..4e75e5886f 100755
--- a/bin/publish
+++ b/bin/publish
@@ -9,20 +9,15 @@ cd ${garden_root}
 lerna version --no-push
 git reset HEAD~1
 
-# TODO: set this up to work with multiple packages
-cd garden-cli
-
-../node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md --commit-path . -s
+./node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md --commit-path . -s
 git add CHANGELOG.md
-version=$(node -p "require('./package.json').version")
+version=$(node -p "require('./lerna.json').version")
 git commit -m "chore(release): release ${version}"
 
-npm publish
-
-cd ..
-
 git push --tags --no-verify
 git push --no-verify
 
+# TODO: set this up to work with multiple packages
 cd garden-cli
+npm publish
 gulp update-brew