diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 845211b..6617fc1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
         with:
           go-version: 1.13
       - name: Install linter
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint
+        run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.18.0
       - name: Run linter
         run: golangci-lint run
 
@@ -29,17 +29,6 @@ jobs:
       - name: Run unit tests
         run: go test -v -p 1 -tags=unit -covermode=atomic -timeout=60s ./...
 
-  benchmark:
-    name: Benchmark
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-go@v1
-        with:
-          go-version: 1.13
-      - name: Benchmark
-        run: go test -run=Benchmark -benchmem -bench=.
-
   integration:
     name: Integration Tests
     runs-on: ubuntu-18.04
@@ -69,3 +58,25 @@ jobs:
           AWS_ENDPOINT: http://s3:4572
           POSTGRES_URL: postgres://postgres:password@postgres/testdb?sslmode=disable
           MARIADB_URL: root:password@tcp(mariadb:3306)/testdb?charset=utf8&parseTime=True&loc=Local
+
+  benchmark:
+    name: Benchmark
+    runs-on: ubuntu-18.04
+    services:
+      s3:
+        image: localstack/localstack:latest
+        env:
+          SERVICES: s3
+      postgres:
+        image: healthcheck/postgres
+        env:
+          POSTGRES_DB: testdb
+          POSTGRES_PASSWORD: password
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-go@v1
+        with:
+          go-version: 1.13
+      - name: Benchmark
+        run: go test -run=Benchmark -benchmem -bench=.
+