diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x
index 9e4085d886..08e6ded7a1 100644
--- a/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x
+++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.s390x
@@ -4,10 +4,8 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu
 
 ENV GO_VERSION 1.8.3
 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
 ENV GOPATH /go
-
+ENV PATH $PATH:/usr/local/go/bin:/$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
 ENV RUNC_BUILDTAGS apparmor selinux
 
diff --git a/components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x b/components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x
index c50d678ef4..129e58fa88 100644
--- a/components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x
+++ b/components/packaging/deb/ubuntu-yakkety/Dockerfile.s390x
@@ -4,10 +4,8 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu
 
 ENV GO_VERSION 1.8.3
 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
 ENV GOPATH /go
-
+ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
 ENV RUNC_BUILDTAGS apparmor selinux
 
diff --git a/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x b/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x
index 46ee96101e..91f03a144f 100644
--- a/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x
+++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.s390x
@@ -4,10 +4,8 @@ RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools bu
 
 ENV GO_VERSION 1.8.3
 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
 ENV GOPATH /go
-
+ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
 ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
 ENV RUNC_BUILDTAGS apparmor seccomp selinux