diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
index 110d436..722367b 100644
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@ -31,7 +31,6 @@ pipeline {
 							env.BASE_TAG                = 'latest'
 							env.BUILDX_PUSH_TAGS        = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
 							env.BUILDX_PUSH_TAGS_NODE   = "-t docker.io/nginxproxymanager/${IMAGE}:node"
-							env.BUILDX_PUSH_TAGS_GOLANG = "-t docker.io/nginxproxymanager/${IMAGE}:golang"
 						}
 					}
 				}
@@ -47,7 +46,6 @@ pipeline {
 							env.BASE_TAG                = "github-${BRANCH_LOWER}"
 							env.BUILDX_PUSH_TAGS        = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
 							env.BUILDX_PUSH_TAGS_NODE   = "${BUILDX_PUSH_TAGS}-node"
-							env.BUILDX_PUSH_TAGS_GOLANG = "${BUILDX_PUSH_TAGS}-golang"
 						}
 					}
 				}
@@ -66,17 +64,6 @@ pipeline {
 		}
 		stage('Other Builds') {
 			parallel {
-				stage('Golang') {
-					environment {
-						BUILDX_NAME = "${IMAGE}_${GIT_BRANCH}_golang"
-					}
-					steps {
-						withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'DOCKER_PASS', usernameVariable: 'DOCKER_USER')]) {
-							sh 'docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}"'
-							sh "./scripts/buildx --push -f docker/Dockerfile.golang ${BUILDX_PUSH_TAGS_GOLANG}"
-						}
-					}
-				}
 				stage('Node') {
 					environment {
 						BUILDX_NAME = "${IMAGE}_${GIT_BRANCH}_node"
@@ -105,7 +92,6 @@ pipeline {
 
 - `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}`
 - `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-node`
-- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-golang`
 """)
 				}
 			}
diff --git a/docker/Dockerfile.golang b/docker/Dockerfile.golang
deleted file mode 100644
index c80842c..0000000
--- a/docker/Dockerfile.golang
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM golang:latest as go
-FROM jc21/nginx-full:${BASE_TAG:-latest}
-
-ARG TARGETPLATFORM
-
-RUN echo "Golang: jc21/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
-
-LABEL maintainer="Jamie Curnow <jc@jc21.com>"
-
-RUN apt-get update \
-	&& apt-get install -y wget gcc g++ make git sqlite3 \
-	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
-
-# copy go from golang
-COPY --from=go /usr/local/go /usr/local/go
-
-ENV GOPATH=/opt/go PATH="/usr/local/go/bin:$PATH:/opt/go/bin"
-RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \
-	&& chmod -R 777 "$GOPATH" \
-	&& echo "====> ${TARGETPLATFORM}: $(go version)"
-
-WORKDIR /root
-
-# Gotools
-RUN if [ "$TARGETPLATFORM" == "" ] || [ "$TARGETPLATFORM" == "linux/amd64" ]; then cd /usr && wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.39.0; fi
-RUN go get -u github.com/kyoh86/richgo \
-	&& rm -rf /root/.cache/go-build
-
diff --git a/docker/Dockerfile.node b/docker/Dockerfile.node
index 64d1040..eb671db 100644
--- a/docker/Dockerfile.node
+++ b/docker/Dockerfile.node
@@ -1,4 +1,4 @@
-FROM jc21/nginx-full:${BASE_TAG:-latest}
+FROM nginxproxymanager/nginx-full:${BASE_TAG:-latest}
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
 ARG TARGETPLATFORM