diff --git a/Dockerfile b/Dockerfile
index 82fbb4d2ad..327090342c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,12 @@ RUN cp /go/pkg/mod/github.com/wasmerio/go-ext-wasm@*/wasmer/libwasmer.so libwasm
 COPY . .
 
 # Build
-RUN GOBIN=$GOPATH/src/github.com/ChainSafe/gossamer/bin go run scripts/ci.go install
+ARG GO_BUILD_FLAGS
+RUN go build \
+    -trimpath \
+    -o ./bin/gossamer \
+    ${GO_BUILD_FLAGS} \
+    ./cmd/gossamer
 
 # Final stage based on Debian
 FROM debian:${DEBIAN_VERSION}
diff --git a/Makefile b/Makefile
index 8cfa4bee33..3f0b633887 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,6 @@ proto:
 ## test: Runs `go test` on project test files.
 test:
 	@echo "  >  \033[32mRunning tests...\033[0m "
-	#GOBIN=$(PWD)/bin go run scripts/ci.go test
 	git lfs pull
 	go test -short -coverprofile c.out ./... -timeout=30m
 
@@ -80,11 +79,11 @@ deps:
 ## build: Builds application binary and stores it in `./bin/gossamer`
 build:
 	@echo "  >  \033[32mBuilding binary...\033[0m "
-	GOBIN=$(PWD)/bin go run scripts/ci.go install
+	go build -trimpath -o ./bin/gossamer ./cmd/gossamer
 
 ## debug: Builds application binary with debug flags and stores it in `./bin/gossamer`
 build-debug: clean
-	cd cmd/gossamer && go build -gcflags=all="-N -l" -o ../../bin/gossamer && cd ../..
+	go build -trimpath -gcflags=all="-N -l" -o ./bin/gossamer ./cmd/gossamer
 
 ## init: Initialise gossamer using the default genesis and toml configuration files
 init:
@@ -120,9 +119,8 @@ docker-build:
 	@echo "  >  \033[32mBuilding Docker Container...\033[0m "
 	docker build -t $(FULLDOCKERNAME) -f Dockerfile .
 
-gossamer: clean
-	cd cmd/gossamer && go build -o ../../bin/gossamer && cd ../..
+gossamer: clean build
 
 ## install: install the gossamer binary in $GOPATH/bin
-install:
-	GOBIN=$(GOPATH)/bin go run scripts/ci.go install
+install: build
+	mv ./bin/gossamer $(GOPATH)/bin/gossamer
diff --git a/scripts/ci.go b/scripts/ci.go
deleted file mode 100755
index 7a805020de..0000000000
--- a/scripts/ci.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2019 ChainSafe Systems (ON) Corp.
-// This file is part of gossamer.
-//
-// The gossamer library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The gossamer library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the gossamer library. If not, see <http://www.gnu.org/licenses/>.
-
-//go:build none
-// +build none
-
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-)
-
-func main() {
-
-	log.SetFlags(log.Lshortfile)
-
-	if _, err := os.Stat(filepath.Join("scripts", "ci.go")); os.IsNotExist(err) {
-		log.Fatal("should run build from root dir")
-	}
-	if len(os.Args) < 2 {
-		log.Fatal("cmd required, eg: install")
-	}
-	switch os.Args[1] {
-	case "install":
-		install(false)
-	case "install-debug":
-		install(true)
-	default:
-		log.Fatal("cmd not found", os.Args[1])
-	}
-}
-
-func install(debug bool) {
-	argsList := append([]string{"list"}, []string{"./..."}...)
-
-	cmd := exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), argsList...)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		log.Fatalf("could not list packages: %v\n%s", err, string(out))
-	}
-	var packages []string
-	for _, line := range strings.Split(string(out), "\n") {
-		if strings.Contains(line, "/gossamer/") {
-			packages = append(packages, strings.TrimSpace(line))
-		}
-	}
-
-	argsInstall := append([]string{"install"})
-	cmd = exec.Command(filepath.Join(runtime.GOROOT(), "bin", "go"), argsInstall...)
-	cmd.Args = append(cmd.Args, "-v")
-	if debug {
-		cmd.Args = append(cmd.Args, "-gcflags=\"all=-N -l\"")
-	}
-	cmd.Args = append(cmd.Args, packages...)
-
-	fmt.Println("Build Gossamer", strings.Join(cmd.Args, " \\\n"))
-	cmd.Stderr, cmd.Stdout = os.Stderr, os.Stdout
-
-	if err := cmd.Run(); err != nil {
-		log.Fatal("Error: Could not build Gossamer. ", "error: ", err, ", cmd: ", cmd)
-	}
-}
diff --git a/scripts/ci.sh b/scripts/ci.sh
deleted file mode 100755
index 2ff381c431..0000000000
--- a/scripts/ci.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Copyright 2019 ChainSafe Systems (ON) Corp.
-# This file is part of gossamer.
-#
-# The gossamer library is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# The gossamer library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with the gossamer library. If not, see <http://www.gnu.org/licenses/>.
-
-set -e
-
-echo ">> Running tests..."
-go test -short -coverprofile c.out ./... -timeout=15m
-#./cc-test-reporter after-build --exit-code $?
-# echo ">> Running race condition test on runtime"
-# go test -short -race ./lib/runtime
-echo ">> Running race condition test on priority queue"
-go test -short -race ./lib/transaction/