diff --git a/.travis.yml b/.travis.yml
index 29d7690ca..f4839e07d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ git:
   depth: false
 language: go
 go:
-- 1.11.x
+- 1.13.x
 services:
 - docker
 env:
@@ -23,7 +23,7 @@ script:
 #- make lint
 - make fmt-check vet it
 after_success:
-- docker pull stashapp/compiler:develop
+- docker pull stashapp/compiler:4
 - sh ./scripts/cross-compile.sh
 - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sh ./scripts/upload-pull-request.sh; fi'
 before_deploy:
diff --git a/docker/build/x86_64/Dockerfile b/docker/build/x86_64/Dockerfile
index 54fed78f9..6eabf1105 100644
--- a/docker/build/x86_64/Dockerfile
+++ b/docker/build/x86_64/Dockerfile
@@ -2,10 +2,10 @@
 # ie from top=level stash:
 # docker build -t stash/build -f docker/build/x86_64/Dockerfile .
 
-FROM golang:1.11.13 as compiler
+FROM golang:1.13.15 as compiler
 
 RUN apt-get update && apt-get install -y apt-transport-https
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
 
 # prevent caching of the key
 ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
@@ -48,7 +48,7 @@ RUN make generate
 RUN make ui 
 RUN make build
 
-FROM ubuntu:19.10 as app
+FROM ubuntu:20.04 as app
 
 RUN apt-get update && apt-get -y install ca-certificates
 COPY --from=compiler /stash/stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
diff --git a/docker/ci/x86_64/Dockerfile b/docker/ci/x86_64/Dockerfile
index 54d1bec4f..2cfe763fe 100644
--- a/docker/ci/x86_64/Dockerfile
+++ b/docker/ci/x86_64/Dockerfile
@@ -1,7 +1,7 @@
 
 # must be built from /dist directory
 
-FROM ubuntu:18.04 as prep
+FROM ubuntu:20.04 as prep
 LABEL MAINTAINER="https://discord.gg/Uz29ny"
 
 RUN apt-get update && \
@@ -16,7 +16,7 @@ RUN curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/f
     rm ffmpeg.tar.xz && \
     mv /ffmpeg*/ /ffmpeg/
 
-FROM ubuntu:18.04 as app
+FROM ubuntu:20.04 as app
 RUN apt-get update && apt-get -y install ca-certificates
 COPY --from=prep /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
 COPY /stash-linux /usr/bin/stash
diff --git a/docker/compiler/Dockerfile b/docker/compiler/Dockerfile
index 09c1ffd08..5f3f4b4c6 100644
--- a/docker/compiler/Dockerfile
+++ b/docker/compiler/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.5
+FROM golang:1.13.15
 
 LABEL maintainer="stashappdev@gmail.com"
 
@@ -9,7 +9,7 @@ ENV PACKR2_DOWNLOAD_URL=https://github.com/gobuffalo/packr/releases/download/v${
 
 # Install tools
 RUN apt-get update && apt-get install -y apt-transport-https
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash -
 
 # prevent caching of the key
 ADD https://dl.yarnpkg.com/debian/pubkey.gpg yarn.gpg
@@ -21,7 +21,7 @@ RUN apt-get update && \
     apt-get install -y automake autogen \
     libtool libxml2-dev uuid-dev libssl-dev bash \
     patch make tar xz-utils bzip2 gzip sed cpio \
-	gcc-6-multilib g++-6-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \
+	gcc-8-multilib gcc-mingw-w64 g++-mingw-w64 clang llvm-dev \
 	gcc-arm-linux-gnueabi libc-dev-armel-cross linux-libc-dev-armel-cross \
     gcc-arm-linux-gnueabihf libc-dev-armhf-cross \
     gcc-aarch64-linux-gnu libc-dev-arm64-cross \
diff --git a/docker/compiler/Makefile b/docker/compiler/Makefile
index c705b1b6f..6f444e73d 100644
--- a/docker/compiler/Makefile
+++ b/docker/compiler/Makefile
@@ -1,6 +1,6 @@
 user=stashapp
 repo=compiler
-version=3
+version=4
 
 latest:
 	docker build -t ${user}/${repo}:latest .
diff --git a/docker/compiler/README.md b/docker/compiler/README.md
index 437dae408..abe4060b5 100644
--- a/docker/compiler/README.md
+++ b/docker/compiler/README.md
@@ -1 +1,3 @@
-Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser
\ No newline at end of file
+Modified from https://github.com/bep/dockerfiles/tree/master/ci-goreleaser
+
+When the dockerfile is changed, the version number should be incremented in the Makefile and the new version tag should be pushed to docker hub. The `scripts/cross-compile.sh` script should also be updated to use the new version number tag, and `.travis.yml` needs to be updated to pull the correct image tag.
\ No newline at end of file
diff --git a/docker/develop/x86_64/Dockerfile b/docker/develop/x86_64/Dockerfile
index 94624c7b0..cca25aafd 100644
--- a/docker/develop/x86_64/Dockerfile
+++ b/docker/develop/x86_64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 as prep
+FROM ubuntu:20.04 as prep
 LABEL MAINTAINER="https://discord.gg/Uz29ny"
 
 RUN apt-get update && \
@@ -17,7 +17,7 @@ RUN curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/f
     rm ffmpeg.tar.xz && \
     mv /ffmpeg*/ /ffmpeg/
 
-FROM ubuntu:18.04 as app
+FROM ubuntu:20.04 as app
 RUN apt-get update && apt-get -y install ca-certificates
 COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
 EXPOSE 9999
diff --git a/docker/production/x86_64/Dockerfile b/docker/production/x86_64/Dockerfile
index 41285d760..bc152161c 100644
--- a/docker/production/x86_64/Dockerfile
+++ b/docker/production/x86_64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 as prep
+FROM ubuntu:20.04 as prep
 LABEL MAINTAINER="leopere [at] nixc [dot] us"
 
 RUN apt-get update && \
@@ -17,7 +17,7 @@ RUN curl --http1.1 -o /ffmpeg.tar.xz https://johnvansickle.com/ffmpeg/releases/f
     rm ffmpeg.tar.xz && \
     mv /ffmpeg*/ /ffmpeg/
 
-FROM ubuntu:18.04 as app
+FROM ubuntu:20.04 as app
 RUN apt-get update && apt-get -y install ca-certificates
 COPY --from=prep /stash /ffmpeg/ffmpeg /ffmpeg/ffprobe /usr/bin/
 EXPOSE 9999
diff --git a/go.mod b/go.mod
index a822751e1..4dead0219 100644
--- a/go.mod
+++ b/go.mod
@@ -36,4 +36,4 @@ require (
 
 replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
 
-go 1.11
+go 1.13
diff --git a/scripts/cross-compile.sh b/scripts/cross-compile.sh
index 5b9066ecb..e1c72f19a 100755
--- a/scripts/cross-compile.sh
+++ b/scripts/cross-compile.sh
@@ -14,4 +14,4 @@ LINUX_ARM32v6="echo '=== Building Linux (armv6 | Raspberry Pi 1) binary ==='; $S
 
 COMMAND="$SETUP $WINDOWS $DARWIN $LINUX_AMD64 $LINUX_ARM64v8 $LINUX_ARM32v7 $LINUX_ARM32v6 echo '=== Build complete ==='"
 
-docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash stashapp/compiler:develop /bin/bash -c "$COMMAND"
+docker run --rm --mount type=bind,source="$(pwd)",target=/stash -w /stash stashapp/compiler:4 /bin/bash -c "$COMMAND"