diff --git a/11/jdk/alpine/Dockerfile.releases.full b/11/jdk/alpine/Dockerfile
similarity index 100%
rename from 11/jdk/alpine/Dockerfile.releases.full
rename to 11/jdk/alpine/Dockerfile
diff --git a/11/jdk/centos/Dockerfile.releases.full b/11/jdk/centos/Dockerfile
similarity index 100%
rename from 11/jdk/centos/Dockerfile.releases.full
rename to 11/jdk/centos/Dockerfile
diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/11/jdk/ubi/ubi9-minimal/Dockerfile
similarity index 100%
rename from 11/jdk/ubi/ubi9-minimal/Dockerfile.releases.full
rename to 11/jdk/ubi/ubi9-minimal/Dockerfile
diff --git a/11/jdk/ubuntu/focal/Dockerfile.releases.full b/11/jdk/ubuntu/focal/Dockerfile
similarity index 100%
rename from 11/jdk/ubuntu/focal/Dockerfile.releases.full
rename to 11/jdk/ubuntu/focal/Dockerfile
diff --git a/11/jdk/ubuntu/jammy/Dockerfile.releases.full b/11/jdk/ubuntu/jammy/Dockerfile
similarity index 100%
rename from 11/jdk/ubuntu/jammy/Dockerfile.releases.full
rename to 11/jdk/ubuntu/jammy/Dockerfile
diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile.releases.full b/11/jdk/windows/nanoserver-1809/Dockerfile
similarity index 100%
rename from 11/jdk/windows/nanoserver-1809/Dockerfile.releases.full
rename to 11/jdk/windows/nanoserver-1809/Dockerfile
diff --git a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile.releases.full b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile
similarity index 100%
rename from 11/jdk/windows/nanoserver-ltsc2022/Dockerfile.releases.full
rename to 11/jdk/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile.releases.full b/11/jdk/windows/windowsservercore-1809/Dockerfile
similarity index 100%
rename from 11/jdk/windows/windowsservercore-1809/Dockerfile.releases.full
rename to 11/jdk/windows/windowsservercore-1809/Dockerfile
diff --git a/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile.releases.full b/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile
similarity index 100%
rename from 11/jdk/windows/windowsservercore-ltsc2022/Dockerfile.releases.full
rename to 11/jdk/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/11/jre/alpine/Dockerfile.releases.full b/11/jre/alpine/Dockerfile
similarity index 100%
rename from 11/jre/alpine/Dockerfile.releases.full
rename to 11/jre/alpine/Dockerfile
diff --git a/11/jre/centos/Dockerfile.releases.full b/11/jre/centos/Dockerfile
similarity index 100%
rename from 11/jre/centos/Dockerfile.releases.full
rename to 11/jre/centos/Dockerfile
diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/11/jre/ubi/ubi9-minimal/Dockerfile
similarity index 100%
rename from 11/jre/ubi/ubi9-minimal/Dockerfile.releases.full
rename to 11/jre/ubi/ubi9-minimal/Dockerfile
diff --git a/11/jre/ubuntu/focal/Dockerfile.releases.full b/11/jre/ubuntu/focal/Dockerfile
similarity index 100%
rename from 11/jre/ubuntu/focal/Dockerfile.releases.full
rename to 11/jre/ubuntu/focal/Dockerfile
diff --git a/11/jre/ubuntu/jammy/Dockerfile.releases.full b/11/jre/ubuntu/jammy/Dockerfile
similarity index 100%
rename from 11/jre/ubuntu/jammy/Dockerfile.releases.full
rename to 11/jre/ubuntu/jammy/Dockerfile
diff --git a/11/jre/windows/nanoserver-1809/Dockerfile.releases.full b/11/jre/windows/nanoserver-1809/Dockerfile
similarity index 100%
rename from 11/jre/windows/nanoserver-1809/Dockerfile.releases.full
rename to 11/jre/windows/nanoserver-1809/Dockerfile
diff --git a/11/jre/windows/nanoserver-ltsc2022/Dockerfile.releases.full b/11/jre/windows/nanoserver-ltsc2022/Dockerfile
similarity index 100%
rename from 11/jre/windows/nanoserver-ltsc2022/Dockerfile.releases.full
rename to 11/jre/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/11/jre/windows/windowsservercore-1809/Dockerfile.releases.full b/11/jre/windows/windowsservercore-1809/Dockerfile
similarity index 100%
rename from 11/jre/windows/windowsservercore-1809/Dockerfile.releases.full
rename to 11/jre/windows/windowsservercore-1809/Dockerfile
diff --git a/11/jre/windows/windowsservercore-ltsc2022/Dockerfile.releases.full b/11/jre/windows/windowsservercore-ltsc2022/Dockerfile
similarity index 100%
rename from 11/jre/windows/windowsservercore-ltsc2022/Dockerfile.releases.full
rename to 11/jre/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/17/jdk/alpine/Dockerfile.releases.full b/17/jdk/alpine/Dockerfile
similarity index 100%
rename from 17/jdk/alpine/Dockerfile.releases.full
rename to 17/jdk/alpine/Dockerfile
diff --git a/17/jdk/centos/Dockerfile.releases.full b/17/jdk/centos/Dockerfile
similarity index 100%
rename from 17/jdk/centos/Dockerfile.releases.full
rename to 17/jdk/centos/Dockerfile
diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/17/jdk/ubi/ubi9-minimal/Dockerfile
similarity index 100%
rename from 17/jdk/ubi/ubi9-minimal/Dockerfile.releases.full
rename to 17/jdk/ubi/ubi9-minimal/Dockerfile
diff --git a/17/jdk/ubuntu/focal/Dockerfile.releases.full b/17/jdk/ubuntu/focal/Dockerfile
similarity index 100%
rename from 17/jdk/ubuntu/focal/Dockerfile.releases.full
rename to 17/jdk/ubuntu/focal/Dockerfile
diff --git a/17/jdk/ubuntu/jammy/Dockerfile.releases.full b/17/jdk/ubuntu/jammy/Dockerfile
similarity index 100%
rename from 17/jdk/ubuntu/jammy/Dockerfile.releases.full
rename to 17/jdk/ubuntu/jammy/Dockerfile
diff --git a/17/jdk/windows/nanoserver-1809/Dockerfile.releases.full b/17/jdk/windows/nanoserver-1809/Dockerfile
similarity index 100%
rename from 17/jdk/windows/nanoserver-1809/Dockerfile.releases.full
rename to 17/jdk/windows/nanoserver-1809/Dockerfile
diff --git a/17/jdk/windows/nanoserver-ltsc2022/Dockerfile.releases.full b/17/jdk/windows/nanoserver-ltsc2022/Dockerfile
similarity index 100%
rename from 17/jdk/windows/nanoserver-ltsc2022/Dockerfile.releases.full
rename to 17/jdk/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/17/jdk/windows/windowsservercore-1809/Dockerfile.releases.full b/17/jdk/windows/windowsservercore-1809/Dockerfile
similarity index 100%
rename from 17/jdk/windows/windowsservercore-1809/Dockerfile.releases.full
rename to 17/jdk/windows/windowsservercore-1809/Dockerfile
diff --git a/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile.releases.full b/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile
similarity index 100%
rename from 17/jdk/windows/windowsservercore-ltsc2022/Dockerfile.releases.full
rename to 17/jdk/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/17/jre/alpine/Dockerfile.releases.full b/17/jre/alpine/Dockerfile
similarity index 100%
rename from 17/jre/alpine/Dockerfile.releases.full
rename to 17/jre/alpine/Dockerfile
diff --git a/17/jre/centos/Dockerfile.releases.full b/17/jre/centos/Dockerfile
similarity index 100%
rename from 17/jre/centos/Dockerfile.releases.full
rename to 17/jre/centos/Dockerfile
diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/17/jre/ubi/ubi9-minimal/Dockerfile
similarity index 100%
rename from 17/jre/ubi/ubi9-minimal/Dockerfile.releases.full
rename to 17/jre/ubi/ubi9-minimal/Dockerfile
diff --git a/17/jre/ubuntu/focal/Dockerfile.releases.full b/17/jre/ubuntu/focal/Dockerfile
similarity index 100%
rename from 17/jre/ubuntu/focal/Dockerfile.releases.full
rename to 17/jre/ubuntu/focal/Dockerfile
diff --git a/17/jre/ubuntu/jammy/Dockerfile.releases.full b/17/jre/ubuntu/jammy/Dockerfile
similarity index 100%
rename from 17/jre/ubuntu/jammy/Dockerfile.releases.full
rename to 17/jre/ubuntu/jammy/Dockerfile
diff --git a/17/jre/windows/nanoserver-1809/Dockerfile.releases.full b/17/jre/windows/nanoserver-1809/Dockerfile
similarity index 100%
rename from 17/jre/windows/nanoserver-1809/Dockerfile.releases.full
rename to 17/jre/windows/nanoserver-1809/Dockerfile
diff --git a/17/jre/windows/nanoserver-ltsc2022/Dockerfile.releases.full b/17/jre/windows/nanoserver-ltsc2022/Dockerfile
similarity index 100%
rename from 17/jre/windows/nanoserver-ltsc2022/Dockerfile.releases.full
rename to 17/jre/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/17/jre/windows/windowsservercore-1809/Dockerfile.releases.full b/17/jre/windows/windowsservercore-1809/Dockerfile
similarity index 100%
rename from 17/jre/windows/windowsservercore-1809/Dockerfile.releases.full
rename to 17/jre/windows/windowsservercore-1809/Dockerfile
diff --git a/17/jre/windows/windowsservercore-ltsc2022/Dockerfile.releases.full b/17/jre/windows/windowsservercore-ltsc2022/Dockerfile
similarity index 100%
rename from 17/jre/windows/windowsservercore-ltsc2022/Dockerfile.releases.full
rename to 17/jre/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/21/jdk/alpine/Dockerfile.releases.full b/21/jdk/alpine/Dockerfile
similarity index 100%
rename from 21/jdk/alpine/Dockerfile.releases.full
rename to 21/jdk/alpine/Dockerfile
diff --git a/21/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/21/jdk/ubi/ubi9-minimal/Dockerfile
similarity index 100%
rename from 21/jdk/ubi/ubi9-minimal/Dockerfile.releases.full
rename to 21/jdk/ubi/ubi9-minimal/Dockerfile
diff --git a/21/jdk/ubuntu/jammy/Dockerfile.releases.full b/21/jdk/ubuntu/jammy/Dockerfile
similarity index 100%
rename from 21/jdk/ubuntu/jammy/Dockerfile.releases.full
rename to 21/jdk/ubuntu/jammy/Dockerfile
diff --git a/21/jdk/windows/nanoserver-1809/Dockerfile.releases.full b/21/jdk/windows/nanoserver-1809/Dockerfile
similarity index 100%
rename from 21/jdk/windows/nanoserver-1809/Dockerfile.releases.full
rename to 21/jdk/windows/nanoserver-1809/Dockerfile
diff --git a/21/jdk/windows/nanoserver-ltsc2022/Dockerfile.releases.full b/21/jdk/windows/nanoserver-ltsc2022/Dockerfile
similarity index 100%
rename from 21/jdk/windows/nanoserver-ltsc2022/Dockerfile.releases.full
rename to 21/jdk/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/21/jdk/windows/windowsservercore-1809/Dockerfile.releases.full b/21/jdk/windows/windowsservercore-1809/Dockerfile
similarity index 100%
rename from 21/jdk/windows/windowsservercore-1809/Dockerfile.releases.full
rename to 21/jdk/windows/windowsservercore-1809/Dockerfile
diff --git a/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile.releases.full b/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile
similarity index 100%
rename from 21/jdk/windows/windowsservercore-ltsc2022/Dockerfile.releases.full
rename to 21/jdk/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/21/jre/alpine/Dockerfile.releases.full b/21/jre/alpine/Dockerfile
similarity index 100%
rename from 21/jre/alpine/Dockerfile.releases.full
rename to 21/jre/alpine/Dockerfile
diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/21/jre/ubi/ubi9-minimal/Dockerfile
similarity index 100%
rename from 21/jre/ubi/ubi9-minimal/Dockerfile.releases.full
rename to 21/jre/ubi/ubi9-minimal/Dockerfile
diff --git a/21/jre/ubuntu/jammy/Dockerfile.releases.full b/21/jre/ubuntu/jammy/Dockerfile
similarity index 100%
rename from 21/jre/ubuntu/jammy/Dockerfile.releases.full
rename to 21/jre/ubuntu/jammy/Dockerfile
diff --git a/21/jre/windows/nanoserver-1809/Dockerfile.releases.full b/21/jre/windows/nanoserver-1809/Dockerfile
similarity index 100%
rename from 21/jre/windows/nanoserver-1809/Dockerfile.releases.full
rename to 21/jre/windows/nanoserver-1809/Dockerfile
diff --git a/21/jre/windows/nanoserver-ltsc2022/Dockerfile.releases.full b/21/jre/windows/nanoserver-ltsc2022/Dockerfile
similarity index 100%
rename from 21/jre/windows/nanoserver-ltsc2022/Dockerfile.releases.full
rename to 21/jre/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/21/jre/windows/windowsservercore-1809/Dockerfile.releases.full b/21/jre/windows/windowsservercore-1809/Dockerfile
similarity index 100%
rename from 21/jre/windows/windowsservercore-1809/Dockerfile.releases.full
rename to 21/jre/windows/windowsservercore-1809/Dockerfile
diff --git a/21/jre/windows/windowsservercore-ltsc2022/Dockerfile.releases.full b/21/jre/windows/windowsservercore-ltsc2022/Dockerfile
similarity index 100%
rename from 21/jre/windows/windowsservercore-ltsc2022/Dockerfile.releases.full
rename to 21/jre/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/8/jdk/alpine/Dockerfile.releases.full b/8/jdk/alpine/Dockerfile
similarity index 100%
rename from 8/jdk/alpine/Dockerfile.releases.full
rename to 8/jdk/alpine/Dockerfile
diff --git a/8/jdk/centos/Dockerfile.releases.full b/8/jdk/centos/Dockerfile
similarity index 100%
rename from 8/jdk/centos/Dockerfile.releases.full
rename to 8/jdk/centos/Dockerfile
diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile.releases.full b/8/jdk/ubi/ubi9-minimal/Dockerfile
similarity index 100%
rename from 8/jdk/ubi/ubi9-minimal/Dockerfile.releases.full
rename to 8/jdk/ubi/ubi9-minimal/Dockerfile
diff --git a/8/jdk/ubuntu/focal/Dockerfile.releases.full b/8/jdk/ubuntu/focal/Dockerfile
similarity index 100%
rename from 8/jdk/ubuntu/focal/Dockerfile.releases.full
rename to 8/jdk/ubuntu/focal/Dockerfile
diff --git a/8/jdk/ubuntu/jammy/Dockerfile.releases.full b/8/jdk/ubuntu/jammy/Dockerfile
similarity index 100%
rename from 8/jdk/ubuntu/jammy/Dockerfile.releases.full
rename to 8/jdk/ubuntu/jammy/Dockerfile
diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile.releases.full b/8/jdk/windows/nanoserver-1809/Dockerfile
similarity index 100%
rename from 8/jdk/windows/nanoserver-1809/Dockerfile.releases.full
rename to 8/jdk/windows/nanoserver-1809/Dockerfile
diff --git a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile.releases.full b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile
similarity index 100%
rename from 8/jdk/windows/nanoserver-ltsc2022/Dockerfile.releases.full
rename to 8/jdk/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/8/jdk/windows/windowsservercore-1809/Dockerfile.releases.full b/8/jdk/windows/windowsservercore-1809/Dockerfile
similarity index 100%
rename from 8/jdk/windows/windowsservercore-1809/Dockerfile.releases.full
rename to 8/jdk/windows/windowsservercore-1809/Dockerfile
diff --git a/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile.releases.full b/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile
similarity index 100%
rename from 8/jdk/windows/windowsservercore-ltsc2022/Dockerfile.releases.full
rename to 8/jdk/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/8/jre/alpine/Dockerfile.releases.full b/8/jre/alpine/Dockerfile
similarity index 100%
rename from 8/jre/alpine/Dockerfile.releases.full
rename to 8/jre/alpine/Dockerfile
diff --git a/8/jre/centos/Dockerfile.releases.full b/8/jre/centos/Dockerfile
similarity index 100%
rename from 8/jre/centos/Dockerfile.releases.full
rename to 8/jre/centos/Dockerfile
diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile.releases.full b/8/jre/ubi/ubi9-minimal/Dockerfile
similarity index 100%
rename from 8/jre/ubi/ubi9-minimal/Dockerfile.releases.full
rename to 8/jre/ubi/ubi9-minimal/Dockerfile
diff --git a/8/jre/ubuntu/focal/Dockerfile.releases.full b/8/jre/ubuntu/focal/Dockerfile
similarity index 100%
rename from 8/jre/ubuntu/focal/Dockerfile.releases.full
rename to 8/jre/ubuntu/focal/Dockerfile
diff --git a/8/jre/ubuntu/jammy/Dockerfile.releases.full b/8/jre/ubuntu/jammy/Dockerfile
similarity index 100%
rename from 8/jre/ubuntu/jammy/Dockerfile.releases.full
rename to 8/jre/ubuntu/jammy/Dockerfile
diff --git a/8/jre/windows/nanoserver-1809/Dockerfile.releases.full b/8/jre/windows/nanoserver-1809/Dockerfile
similarity index 100%
rename from 8/jre/windows/nanoserver-1809/Dockerfile.releases.full
rename to 8/jre/windows/nanoserver-1809/Dockerfile
diff --git a/8/jre/windows/nanoserver-ltsc2022/Dockerfile.releases.full b/8/jre/windows/nanoserver-ltsc2022/Dockerfile
similarity index 100%
rename from 8/jre/windows/nanoserver-ltsc2022/Dockerfile.releases.full
rename to 8/jre/windows/nanoserver-ltsc2022/Dockerfile
diff --git a/8/jre/windows/windowsservercore-1809/Dockerfile.releases.full b/8/jre/windows/windowsservercore-1809/Dockerfile
similarity index 100%
rename from 8/jre/windows/windowsservercore-1809/Dockerfile.releases.full
rename to 8/jre/windows/windowsservercore-1809/Dockerfile
diff --git a/8/jre/windows/windowsservercore-ltsc2022/Dockerfile.releases.full b/8/jre/windows/windowsservercore-ltsc2022/Dockerfile
similarity index 100%
rename from 8/jre/windows/windowsservercore-ltsc2022/Dockerfile.releases.full
rename to 8/jre/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/dockerhub_doc_config_update.sh b/dockerhub_doc_config_update.sh
index b5bf5eaad..3d89c24b1 100755
--- a/dockerhub_doc_config_update.sh
+++ b/dockerhub_doc_config_update.sh
@@ -223,7 +223,7 @@ do
 		do
 			for os in ${oses}
 			do
-				for file in $(find . -name "Dockerfile.*" | grep "/${ver}" | grep "${pkg}" | grep "${os}" | sort -n)
+				for file in $(find . -name "Dockerfile" | grep "/${ver}" | grep "${pkg}" | grep "${os}" | sort -n)
 				do
 					# file will look like ./19/jdk/alpine/Dockerfile.releases.full
 					# dockerfile name
@@ -232,9 +232,11 @@ do
 					dfdir=$(dirname $file | cut -c 3-)
 					os=$(echo "${file}" | awk -F '/' '{ print $4 }')
 					# build = release or nightly
-					build=$(echo "${dfname}" | awk -F "." '{ print $3 }')
+					# build=$(echo "${dfname}" | awk -F "." '{ print $3 }')
+					build="release"
 					# btype = full or slim
-					btype=$(echo "${dfname}" | awk -F "." '{ print $4 }')
+					# btype=$(echo "${dfname}" | awk -F "." '{ print $4 }')
+					build="full"
 					generate_official_image_info
 				done
 			done
diff --git a/update_multiarch.sh b/update_multiarch.sh
index 178f72de4..03c8001f4 100755
--- a/update_multiarch.sh
+++ b/update_multiarch.sh
@@ -66,7 +66,9 @@ do
 				# Generate all the Dockerfiles for each of the builds and build types
 				for btype in ${btypes}
 				do
-					file="${dir}/Dockerfile.${build}.${btype}"
+					# file="${dir}/Dockerfile.${build}.${btype}"
+					# Reenable the line above if we ever start doing multi build types
+					file="${dir}/Dockerfile"
 					generate_dockerfile "${file}" "${package}" "${build}" "${btype}" "${osfamily}" "${os}"
 					# Copy the script to generate slim builds.
 					if [ "${btype}" = "slim" ]; then