diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile
index 278bb6251..be9cf01c1 100644
--- a/tools/alpine/Dockerfile
+++ b/tools/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13 AS mirror
+FROM alpine:3.14 AS mirror
 
 # update base image
 RUN apk update && apk upgrade -a
@@ -12,17 +12,6 @@ RUN cat /tmp/packages.$(uname -m) >> /tmp/packages && \
    mkdir -p /mirror/$(apk --print-arch) && \
    apk fetch --recursive -o /mirror/$(apk --print-arch) $(apk info; cat /tmp/packages)
 
-# these are the repository-specific ones, if they exist
-RUN for repopkgs in /tmp/packages.repo.*; do \
-        repo=${repopkgs##*repo.} && archspecific=/tmp/packages.$(uname -m).repo.${repo} && mergedfile=/tmp/packages.merged.${repo} && repofile=/tmp/repositories.${repo} && \
-	cachedir=/tmp/cache/${repo} && \
-	mkdir -p ${cachedir} && \
-        cp ${repopkgs} ${mergedfile} && \
-        if [ -f ${archspecific} ]; then cat ${archspecific} >> ${mergedfile}; fi && \
-        sed "s#alpine/[^\/]*/#alpine/${repo}/#g" /etc/apk/repositories > ${repofile} && \
-        apk update --repositories-file=${repofile} --cache-dir ${cachedir} && \
-        apk fetch --repositories-file=${repofile} --cache-dir ${cachedir} --recursive -o /mirror/$(apk --print-arch) $(cat ${mergedfile}); done
-
 # install abuild and sudo for signing
 RUN apk add --no-cache abuild sudo
 
@@ -83,7 +72,7 @@ RUN set -e && \
         cp iucode_tool /iucode_tool; \
     fi
 
-FROM alpine:3.13
+FROM alpine:3.14
 
 ARG TARGETARCH
 
diff --git a/tools/alpine/packages b/tools/alpine/packages
index 9fec7dd6d..2fd471d66 100644
--- a/tools/alpine/packages
+++ b/tools/alpine/packages
@@ -49,6 +49,7 @@ gettext-dev
 git
 gmp-dev
 gnupg
+go
 grep
 hvtools
 installkernel
diff --git a/tools/alpine/packages.repo.edge b/tools/alpine/packages.repo.edge
deleted file mode 100644
index 4023f2095..000000000
--- a/tools/alpine/packages.repo.edge
+++ /dev/null
@@ -1 +0,0 @@
-go
diff --git a/tools/alpine/packages.x86_64 b/tools/alpine/packages.x86_64
index 652625768..186faabd4 100644
--- a/tools/alpine/packages.x86_64
+++ b/tools/alpine/packages.x86_64
@@ -1,4 +1,3 @@
-gummiboot
 libunwind-dev
 luajit-dev
 open-vm-tools