diff --git a/.circleci/config.yml b/.circleci/config.yml
index 755b70f6c3dc908386c3344bdb2410c80154644f..25a6d4ce6d2a950f115190e0b0eaf2bb5ae4c49e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,14 +7,8 @@ jobs:
     steps:
       - checkout
       - run: 
-          name: get gb
-          command: 'go get github.com/constabulary/gb/...'
-      - run: 
-          name: restore vendor packages
-          command: 'gb vendor restore'
-      - run: 
-          name: gb build
-          command: 'gb build all'
+          name: build binaries
+          command: 'GOBIN=$PWD/`dirname $0`/bin go install -v ./cmd/...'
       - store_artifacts:
           path: bin/media_repo
           destination: media_repo
@@ -29,14 +23,8 @@ jobs:
 #      # Build the project
 #      - checkout
 #      - run:
-#          name: get gb
-#          command: 'go get github.com/constabulary/gb/...'
-#      - run:
-#          name: restore vendor packages
-#          command: 'gb vendor restore'
-#      - run:
-#          name: gb build
-#          command: 'gb build all'
+#          name: build binaries
+#          command: 'GOBIN=$PWD/`dirname $0`/bin go install -v ./cmd/...'
 #      # Install sytest
 #      - run:
 #          name: go to sytest
diff --git a/.travis.yml b/.travis.yml
index c837f2a94164e3f7bab414949315eb68ef250896..1f29379b4c1cea6d8f140e9f138d5bf30b2b9d5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,5 @@
 language: go
 go:
-  - 1.9
-before_install:
-  - go get github.com/constabulary/gb/...
-install:
-  - gb vendor restore
+  - 1.11
 script:
-  - gb build all
+  - ./build.sh
diff --git a/appveyor.yml b/appveyor.yml
index 0912a32a67d7fd387738ac8dec938e24a3135cfb..012310daf3b8880d3c2212efa77760479a151d57 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\turt2live\matrix-media-repo
 
 environment:
   GOPATH: c:\gopath
-  GOVERSION: 1.9
+  GOVERSION: 1.11
   
 branches:
   only: [master, develop]
@@ -20,11 +20,9 @@ install:
   - set PATH=c:\go\bin;c:\gopath\bin;%PATH%
   - go version
   - go env
-  - go get github.com/constabulary/gb/...
-  - gb vendor restore
 
 build_script:
-  - gb build all
+  - GOBIN=$PWD/`dirname $0`/bin go install -v ./cmd/...
 
 artifacts:
   - path: bin/media_repo.exe