diff --git a/Gruntfile.js b/Gruntfile.js
index aee82ecc2a8..b175e3aa961 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,6 +12,8 @@ module.exports = function (grunt) {
     arch: grunt.option('arch') || 'x86_64',
   };
 
+  config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
+
   // load plugins
   require('load-grunt-tasks')(grunt);
 
diff --git a/build.go b/build.go
index f244135f5c4..304f29f98db 100644
--- a/build.go
+++ b/build.go
@@ -45,8 +45,6 @@ func main() {
 
 	log.Printf("Version: %s\n", version)
 
-	//os.Setenv("PATH", fmt.Sprintf("%s%cbin%c%s", os.Getenv("GOPATH"), os.PathSeparator, os.PathListSeparator, os.Getenv("PATH")))
-
 	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
 	flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
 	flag.BoolVar(&race, "race", race, "Use race detector")
@@ -72,17 +70,16 @@ func main() {
 
 		case "test":
 			test("./pkg/...")
+			grunt("test")
 
 		case "latest":
 			version += "-" + getGitSha()
 
 		case "package":
 			//verifyGitRepoIsClean()
+			grunt("release", "--pkgVer="+version)
 			createRpmAndDeb()
 
-		case "build-ui":
-			buildFrontend()
-
 		case "clean":
 			clean()
 
@@ -212,8 +209,8 @@ func ChangeWorkingDir(dir string) {
 	os.Chdir(dir)
 }
 
-func buildFrontend() {
-	runPrint("grunt", "release")
+func grunt(params ...string) {
+	runPrint("./node_modules/grunt-cli/bin/grunt", params...)
 }
 
 func setup() {
diff --git a/conf/custom.ini b/conf/custom.ini
index 9de647dccd0..04de2635860 100644
--- a/conf/custom.ini
+++ b/conf/custom.ini
@@ -6,7 +6,7 @@ static_root_path = src
 
 [log]
 level = Trace
-mode = console, file
+mode = console
 
 
 
diff --git a/wercker-box.yml b/wercker-box.yml
deleted file mode 100644
index 9dd91d568db..00000000000
--- a/wercker-box.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: grafana-build-box
-version: 2.0.0
-inherits: wercker/golang
-type: main
-platform: ubuntu@12.04
-packages:
-  - ruby@2.0.0-p594
-keywords:
-  - ruby
-script: |
-  export RUBYVERSION=2.0.0-p594
-  sudo apt-get update
-  sudo apt-get install git zlib1g-dev libreadline-dev libqtwebkit-dev
-  sudo apt-get remove ruby1.9.1
-  cd $HOME
-  mkdir rubyinstall
-  cd rubyinstall
-  wget ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-$RUBYVERSION.tar.gz
-  tar xzvf ruby-$RUBYVERSION.tar.gz
-  cd ruby-$RUBYVERSION
-  ./configure --with-readline-dir=/usr/include/readline --with-openssl-dir=/usr/include/openssl
-  make
-  make test
-  sudo make install
-  cd $HOME
-  rm -fr rubyinstall
-  echo "gem: --no-rdoc --no-ri" >> $HOME/.gemrc
diff --git a/wercker.yml b/wercker.yml
index f6b8b1b2353..e15ec814ea0 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -20,8 +20,6 @@ build:
           go run build.go clean test build
     # frontend
     - npm-install
-    - grunt:
-        tasks: release
     # create packages
     - script:
         name: create packages