diff --git a/Makefile b/Makefile
index e3ee5cc..15150f3 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ $(OUT_DIR)/mapserver-linux-x86_64: $(OUT_DIR)
 
 $(OUT_DIR)/mapserver-linux-x86: $(OUT_DIR)
 	# apt install gcc-8-i686-linux-gnu
-	GOOS=linux GOARCH=386 CC=i686-linux-gnu-gcc-7 $(GO_BUILD) $(GO_LDFLAGS) -o $@
+	GOOS=linux GOARCH=386 CC=i686-linux-gnu-gcc $(GO_BUILD) $(GO_LDFLAGS) -o $@
 
 $(OUT_DIR)/mapserver-windows-x86.exe: $(OUT_DIR)
 	# apt install gcc-mingw-w64
@@ -60,7 +60,7 @@ $(OUT_DIR)/mapserver-windows-x86-64.exe: $(OUT_DIR)
 
 $(OUT_DIR)/mapserver-linux-arm: $(OUT_DIR)
 	# apt install gcc-5-arm-linux-gnueabihf
-	GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc-5 $(GO_BUILD) $(GO_LDFLAGS) -o $@
+	GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc-8 $(GO_BUILD) $(GO_LDFLAGS) -o $@
 
 
 release: builder_image $(OUT_DIR) $(MOD_ZIP)
diff --git a/docker_builder/Dockerfile b/docker_builder/Dockerfile
index ae6a6a3..9ca17ef 100644
--- a/docker_builder/Dockerfile
+++ b/docker_builder/Dockerfile
@@ -1,18 +1,18 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
-# cross compile stuff
-RUN apt-get update &&\
-	apt-get install -y gcc-mingw-w64 gcc-5-arm-linux-gnueabihf gcc-i686-linux-gnu &&\
-	apt-get install -y software-properties-common git
+# for tzdata
+ENV DEBIAN_FRONTEND=noninteractive
 
-# go stuff
-RUN add-apt-repository ppa:longsleep/golang-backports &&\
-	apt-get update &&\
-	apt-get install -y golang-go
+RUN apt-get update
 
+# cross compile and go stuff
+RUN apt-get install -y gcc-mingw-w64 gcc-8-arm-linux-gnueabihf gcc-i686-linux-gnu &&\
+	apt-get install -y software-properties-common git golang-go
+
+# TODO: move this to a separate package.json and docker container
 # jshint
 RUN apt-get install -y nodejs npm
-RUN npm install -g jshint
+RUN npm install -g jshint@2.12.0
 
 # rollup
-RUN npm install -g rollup
+RUN npm install -g rollup@2.35.1