diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77dc0c608e5dfb1f6deba688df62fb515ab81057..1db537a16ac44e83bfabbbbf536c595119fd9d60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,8 +21,6 @@ before_script:
   - cd $GOPATH/src/$REPO_NAME
   - cp config-sample.json config.json
 
-  - export CC=clang
-
   - make dep
 
 unit_tests:
diff --git a/Makefile b/Makefile
index 92e0dda3fc0f5c0609c82154ef20c07aba6f3da9..9620b61e611e3d40cd02914b37758a548176bd00 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ dep:
 	@go get github.com/mitchellh/gox
 
 build: dep
-	@gox -output="${CI_PROJECT_DIR}/eth-log-alerting-builds/{{.Dir}}_{{.OS}}_{{.Arch}}" -parallel=4 -osarch '!darwin/386'
+	@gox -output="${CI_PROJECT_DIR}/${PROJECT_NAME}/{{.Dir}}_{{.OS}}_{{.Arch}}" -parallel=6 -osarch '!darwin/386'
 
 clean:
 	@rm -f $(PROJECT_NAME)
diff --git a/eth-log-alerting.go b/eth-log-alerting.go
index 0b1ed746710acd680417fcaabd455c1411eee099..ea707921db0de815a8d6725484901845c7771089 100644
--- a/eth-log-alerting.go
+++ b/eth-log-alerting.go
@@ -42,7 +42,7 @@ var (
 	debug     bool
 )
 
-func init() {
+func initConfig() {
 	flag.StringVar(&configPath, "config", "./config.json", "Path to configuration file")
 	flag.Parse()
 
@@ -69,6 +69,8 @@ func init() {
 }
 
 func main() {
+	initConfig()
+
 	logger.Printf("Starting log monitoring with config %s", configPath)
 
 	sig := make(chan os.Signal, 1)