diff --git a/.drone.yml b/.drone.yml
index 173d84c03..0df08a912 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,7 +15,7 @@ steps:
   image: golangci/golangci-lint:v1.41.1
   volumes:
   - name: cache
-    path: /go
+    path: /go/pkg
   commands:
   - golangci-lint run --timeout 5m0s --tests=false --verbose
 
@@ -23,7 +23,7 @@ steps:
   image: golang:1.16.4
   volumes:
   - name: cache
-    path: /go
+    path: /go/pkg
   environment:
     GTS_DB_ADDRESS: postgres
   commands:
@@ -36,7 +36,7 @@ steps:
   image: plugins/docker
   volumes:
   - name: cache
-    path: /go
+    path: /go/pkg
   settings:
     auto_tag: true
     username: gotosocial
@@ -58,8 +58,9 @@ services:
     POSTGRES_PASSWORD: postgres
 
 volumes:
-# This volume is used to hold state between pipeline steps,
-# so that we don't need to reinstall everything between steps.
+# This volume is used to hold state between runs,
+# so that we don't need to reinstall everything in gopkg.
 # See: https://docs.drone.io/pipeline/docker/syntax/volumes/temporary/
 - name: cache
-  temp: {}
+  host:
+    path: /drone/gotosocial/gopkg
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
deleted file mode 100644
index aa5ee2124..000000000
--- a/.github/workflows/golangci-lint.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: golangci-lint
-on:
-  push:
-    tags:
-      - v*
-    branches:
-      - main
-  pull_request:
-jobs:
-  golangci:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.29
-
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true
-
-          # Optional: if set to true then the action will use pre-installed Go.
-          # skip-go-installation: true
-
-          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
-          # skip-pkg-cache: true
-
-          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
-          # skip-build-cache: true