diff --git a/.template-helpers/generate-dockerfile-links-partial.tmpl b/.template-helpers/generate-dockerfile-links-partial.tmpl
index e43861593..f77a52836 100644
--- a/.template-helpers/generate-dockerfile-links-partial.tmpl
+++ b/.template-helpers/generate-dockerfile-links-partial.tmpl
@@ -11,30 +11,28 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
 	{{- "## Simple Tags\n\n" -}}
 {{- end -}}
 
-{{- range $i, $e := $.Entries -}}
+{{- range $i, $e := ($archSpecific | ternary (archFilter arch $.Entries) $.Entries) -}}
 	{{- $arch := $archSpecific | ternary arch ($e.HasArchitecture arch | ternary arch ($e.Architectures | first)) -}}
 
-	{{- if $e.HasArchitecture $arch -}}
-		{{- /* force bashbrew to "fetch" the GitCommit so that it is fully resolved */ -}}
-		{{- $from := $.ArchDockerFrom $arch $e -}}
+	{{- /* force bashbrew to "fetch" the GitCommit so that it is fully resolved */ -}}
+	{{- $from := $.ArchDockerFrom $arch $e -}}
 
-		{{- $gitRepo := $e.ArchGitRepo $arch -}}
-		{{- $repoUrlBase := $gitRepo | replace "git://" "https://" | trimSuffixes ".git" -}}
-		{{- $isGitHub := hasPrefix "https://github.com/" $repoUrlBase -}}
+	{{- $gitRepo := $e.ArchGitRepo $arch -}}
+	{{- $repoUrlBase := $gitRepo | replace "git://" "https://" | trimSuffixes ".git" -}}
+	{{- $isGitHub := hasPrefix "https://github.com/" $repoUrlBase -}}
 
-		{{- if $i -}}
-			{{- "\n" -}}
-		{{- end -}}
-
-		- {{- "\t" -}}
-		{{- if $isGitHub -}} [ {{- end -}}
-		{{- $dir := .ArchDirectory $arch -}}
-		{{- $dockerfilePath := eq $dir "." | ternary "Dockerfile" (join "/" $dir "Dockerfile") -}}
-		` {{- $e.Tags | join "`, `" -}} ` (* {{- $dockerfilePath -}} *)
-		{{- $gitCommit := $e.ArchGitCommit $arch -}}
-		{{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}}
-		{{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}}
+	{{- if $i -}}
+		{{- "\n" -}}
 	{{- end -}}
+
+	- {{- "\t" -}}
+	{{- if $isGitHub -}} [ {{- end -}}
+	{{- $dir := .ArchDirectory $arch -}}
+	{{- $dockerfilePath := eq $dir "." | ternary "Dockerfile" (join "/" $dir "Dockerfile") -}}
+	` {{- $e.Tags | join "`, `" -}} ` (* {{- $dockerfilePath -}} *)
+	{{- $gitCommit := $e.ArchGitCommit $arch -}}
+	{{- if $isGitHub -}} ]( {{- $repoUrlBase -}} /blob/ {{- $gitCommit -}} / {{- $dockerfilePath -}} ) {{- end -}}
+	{{- /* TODO decide what to do (if anything) about non-GitHub repos with respect to URL */ -}}
 {{- end -}}
 {{- "\n\n" -}}
 
@@ -42,13 +40,16 @@ This template defines the "Supported tags and Dockerfile links" portion of an im
 	{{- "## Shared Tags\n\n" -}}
 
 	{{- range $sharedTagGroups -}}
-		{{- "-\t`" -}}
-		{{ .SharedTags | join "`, `" }}
-		{{- "`:\n" -}}
-		{{- range $i, $e := .Entries -}}
-			{{- $arch := $archSpecific | ternary arch ($e.HasArchitecture arch | ternary arch ($e.Architectures | first)) -}}
+		{{- $entries := $archSpecific | ternary (archFilter arch .Entries) .Entries -}}
+
+		{{- if (len $entries) -}}
+			{{- "-\t`" -}}
+			{{ .SharedTags | join "`, `" }}
+			{{- "`:\n" -}}
+
+			{{- range $i, $e := $entries -}}
+				{{- $arch := $archSpecific | ternary arch ($e.HasArchitecture arch | ternary arch ($e.Architectures | first)) -}}
 
-			{{- if $e.HasArchitecture $arch -}}
 				{{- /* force bashbrew to "fetch" the GitCommit so that it is fully resolved */ -}}
 				{{- $from := $.ArchDockerFrom $arch $e -}}
 
diff --git a/.template-helpers/git-prefetch.sh b/.template-helpers/git-prefetch.sh
index a3fef6db2..a3d98c784 100755
--- a/.template-helpers/git-prefetch.sh
+++ b/.template-helpers/git-prefetch.sh
@@ -42,13 +42,11 @@ fi
 
 bashbrewFetchTemplate='
 	'"$templateHeader"'
-	{{- range $i, $e := $.Entries -}}
+	{{- range $i, $e := ($archSpecific | ternary (archFilter arch $.Entries) $.Entries) -}}
 		'"$templateArchVar"'
-		{{- if $e.HasArchitecture $arch -}}
-			{{- join "/" "refs/tags" $arch $.RepoName ($e.Tags | first) -}}
-			{{- ":" -}}
-			{{- "\n" -}}
-		{{- end -}}
+		{{- join "/" "refs/tags" $arch $.RepoName ($e.Tags | first) -}}
+		{{- ":" -}}
+		{{- "\n" -}}
 	{{- end -}}
 '
 
diff --git a/.template-helpers/variant.sh b/.template-helpers/variant.sh
index 4d931d392..85b35c628 100755
--- a/.template-helpers/variant.sh
+++ b/.template-helpers/variant.sh
@@ -20,13 +20,9 @@ IFS=$'\n'
 tags=( $(bashbrew cat -f '
 	{{- $archSpecific := getenv "ARCH_SPECIFIC_DOCS" -}}
 
-	{{- range .Entries -}}
-		{{- $arch := $archSpecific | ternary arch (.HasArchitecture arch | ternary arch (.Architectures | first)) -}}
-
-		{{- if .HasArchitecture $arch -}}
-			{{- join "\n" .Tags -}}
-			{{- "\n" -}}
-		{{- end -}}
+	{{- range ($archSpecific | ternary (archFilter arch .Entries) .Entries) -}}
+		{{- join "\n" .Tags -}}
+		{{- "\n" -}}
 	{{- end -}}
 ' "$repo") )
 unset IFS