diff --git a/.drone.yml b/.drone.yml
index 0a53dbc6..f48637a2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,20 +3,6 @@ workspace:
   path: ui
 
 pipeline:
-  fetch:
-    image: therecipe/qt:linux_static
-    environment:
-      - QT_DIR=/opt/Qt
-      - QT_DOCKER='true'
-      - QT_API=5.13.0
-      - GO111MODULE=on
-      - GOCACHE=/media/sf_GOPATH1/src/cwtch.im/ui/.cache/go-build
-    commands:
-      - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
-      - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git openssh-client
-      - git fetch --tags
-      - go mod download
-      - $QT_DIR/$QT_API/gcc_64/bin/lrelease ui.pro
   build-linux:
     mem_limit: 3G
     image: therecipe/qt:linux_static
@@ -28,14 +14,15 @@ pipeline:
       - QT_DIR=/opt/Qt
       - QT_DOCKER='true'
       - QT_API=5.13.0
-      - export GO111MODULE=on
-      - GOCACHE=/media/sf_GOPATH1/src/cwtch.im/ui/.cache/go-build
+      - GO111MODULE=on
     commands:
       - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
       - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git openssh-client 
+      - go mod download
+      - $QT_DIR/$QT_API/gcc_64/bin/lrelease ui.pro
+      - git fetch --tags 
       - export VERSION=`git describe --tags`
       - export BUILDDATE=`date +%G-%m-%d-%H-%M`
-      - rm -rf vendor
       - go mod vendor
       - qtdeploy  -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE"  build linux
       - cp README.md deploy/linux
@@ -59,11 +46,12 @@ pipeline:
       - ANDROID_NDK_DIR=/home/user/android-ndk-r18b
       - ANDROID_SDK_DIR=/home/user/android-sdk-linux
       - GO111MODULE=on
-      - GOCACHE=/media/sf_GOPATH1/src/cwtch.im/ui/.cache/go-build
     commands:
       - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
       - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git
+      - rm -r vendor/
       - make clean
+      - go mod download
       - export VERSION=`git describe --tags`
       - export BUILDDATE=`date +%G-%m-%d-%H-%M`
       - go mod vendor
@@ -84,12 +72,13 @@ pipeline:
       - QT_DIR=/opt/Qt
       - QT_DOCKER='true'
       - QT_API=5.13.0
-      - export GO111MODULE=on
-      - GOCACHE=/media/sf_GOPATH1/src/cwtch.im/ui/.cache/go-build
+      - GO111MODULE=on
     commands:
       - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
       - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git zip
+      - rm -r vendor
       - make clean
+      - go mod download
       - export VERSION=`git describe --tags`
       - export BUILDDATE=`date +%G-%m-%d-%H-%M`
       - go mod vendor
diff --git a/README.md b/README.md
index 96870753..0979608e 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,11 @@ The UI is built using QT so you will need the development libraries and tools fo
 
 This code relies on [therecipe/qt](https://github.com/therecipe/qt) before getting started consult the [Installation](https://github.com/therecipe/qt/wiki/Installation) and [Getting Started](https://github.com/therecipe/qt/wiki/Getting-Started) documentation to get that up and running. It will make building this much easier.
 
-We are aiming to use Go module support for versioning but it has some issues working with therecipe/qt so we aren't there yet. For now build with GO111MODULE=off using just the GOPATH for dependancies.
+Cwtch UI uses the Go module system for dependancies
 
 ## Linux 
 
-    go get -d
+    go mod vendor
     qtdeploy build linux
     ./deploy/linux/ui -local -debug 2>&1 | grep -v 'Detected anchors on an item that is managed by a layout.'
 
@@ -33,7 +33,7 @@ The grep statement filters out some QML noise.
 
 We supply an arm-pie version of tor in `android/libs/armeabi-v7a` with the name `libtor.so`
 
-    go get -d
+    go mod vendor
     qtdeploy -docker build android
     adb install deploy/android/build-debug.apk
 
@@ -52,7 +52,7 @@ We supply an arm-pie version of tor in `android/libs/armeabi-v7a` with the name
 
 If all that is done, then check out cwtch.im/ui
 
-    go get -d
+    go mod vendor
     qtdeploy
     deploy/windows/ui