diff --git a/Dockerfile-server b/Dockerfile-server
index 57bb216..e41c3d8 100644
--- a/Dockerfile-server
+++ b/Dockerfile-server
@@ -14,12 +14,12 @@
 
 ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal
 ARG BASE_TAG=8.3-201
-ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
+ARG GO_WORKDIR=/go/src/github.com/ibm-messaging/mq-container
 ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.0.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
 ###############################################################################
 # Build stage to build Go code
 ###############################################################################
-FROM registry.redhat.io/ubi8/go-toolset:1.14.7-15 as builder
+FROM docker.io/golang:1.14.12 as builder
 # The URL to download the MQ installer from in tar.gz format
 # This assumes an archive containing the MQ Non-Install packages
 ARG MQ_URL