diff --git a/misc/build-containers/Dockerfile.frt_arm32v7 b/misc/build-containers/Dockerfile.frt_arm32
similarity index 100%
rename from misc/build-containers/Dockerfile.frt_arm32v7
rename to misc/build-containers/Dockerfile.frt_arm32
diff --git a/misc/build-containers/Dockerfile.frt_arm64v8 b/misc/build-containers/Dockerfile.frt_arm64
similarity index 100%
rename from misc/build-containers/Dockerfile.frt_arm64v8
rename to misc/build-containers/Dockerfile.frt_arm64
diff --git a/misc/build-containers/build_all.sh b/misc/build-containers/build_all.sh
index 37fa4c9bec..002ebee52c 100755
--- a/misc/build-containers/build_all.sh
+++ b/misc/build-containers/build_all.sh
@@ -66,14 +66,14 @@ fi
 #docker run ${custom_envvars} \
 #        -v ${basedir}/engine_build_scripts:/root/engine_build_scripts \
 #        -v ${project_root}:/root/project \
-#        -w /root/project pandemonium-frt-arm64v8:${img_version} \
+#        -w /root/project pandemonium-frt-arm64:${img_version} \
 #        bash /root/engine_build_scripts/frt_arm64.sh "$@" 2>&1 | tee logs/frt_arm64.log
 
 # FRT Build arm32
 docker run ${custom_envvars} \
         -v ${basedir}/engine_build_scripts:/root/engine_build_scripts \
         -v ${project_root}:/root/project \
-        -w /root/project pandemonium-frt-arm32v7:${img_version} \
+        -w /root/project pandemonium-frt-arm32:${img_version} \
         bash /root/engine_build_scripts/frt_arm32.sh "$@" 2>&1 | tee logs/frt_arm32.log
 
 # Check files
diff --git a/misc/build-containers/build_containers.sh b/misc/build-containers/build_containers.sh
index 1cf2cb703b..7a569e08b5 100755
--- a/misc/build-containers/build_containers.sh
+++ b/misc/build-containers/build_containers.sh
@@ -33,6 +33,6 @@ $docker_build -t pandemonium-osx:${img_version} -f Dockerfile.osx . 2>&1 | tee l
 $docker_build -t pandemonium-ios:${img_version} -f Dockerfile.ios . 2>&1 | tee logs/ios.log
 
 docker build -t pandemonium-frt-base:${img_version} -f Dockerfile.frt_base . 2>&1 | tee logs/frt_base.log
-$docker_build -t pandemonium-frt-arm32v7:${img_version} -f Dockerfile.frt_arm32v7 . 2>&1 | tee logs/frt_arm32v7.log
-$docker_build -t pandemonium-frt-arm64v8:${img_version} -f Dockerfile.frt_arm64v8 . 2>&1 | tee logs/frt_arm64v8.log
+$docker_build -t pandemonium-frt-arm32:${img_version} -f Dockerfile.frt_arm32 . 2>&1 | tee logs/frt_arm32.log
+$docker_build -t pandemonium-frt-arm64:${img_version} -f Dockerfile.frt_arm64 . 2>&1 | tee logs/frt_arm64.log