diff --git a/docker/build_dockers.bsh b/docker/build_dockers.bsh
index 3774e15a80..9f2a3ab1fe 100755
--- a/docker/build_dockers.bsh
+++ b/docker/build_dockers.bsh
@@ -12,27 +12,18 @@ CUR_DIR=$(dirname "${BASH_SOURCE[0]}")
 : ${SUDO=`if ( [ ! -w /var/run/docker.sock ] && id -nG | grep -qwv docker && [ "${DOCKER_HOST:+dh}" != "dh" ] ) && which sudo > /dev/null 2>&1; then echo sudo; fi`}
 
 if [[ $# == 0 ]]; then
-  IMAGE_DIRS=($(ls -d ${CUR_DIR}/git-lfs_*/Dockerfile))
+  IMAGE_NAMES=($(ls -d ${CUR_DIR}/git-lfs_*.dockerfile))
 else
-  IMAGE_DIRS=("${@}")
+  IMAGE_NAMES=("${@}")
 fi
 
-#Strip the Dockerfile (When appropriate)
-for i in "${!IMAGE_DIRS[@]}"; do
-  IMAGE_NAME=$(basename ${IMAGE_DIRS[$i]})
-  if [ "${IMAGE_NAME,,}" == "dockerfile" ]; then
-    IMAGE_DIRS[$i]=$(dirname ${IMAGE_DIRS[$i]})
-  fi
-done
-unset i IMAGE_NAME
-
 if [ ! -e "${CUR_DIR}/signing.key" ]; then
   touch "${CUR_DIR}/signing.key"
 fi
 
 #This will take a long time the first time
-for IMAGE_DIR in "${IMAGE_DIRS[@]}"; do
-  echo Docker building ${IMAGE_DIR}
-  $SUDO docker build -t git-lfs/$(basename ${IMAGE_DIR}) -f ${IMAGE_DIR}/Dockerfile ${CUR_DIR}
+for IMAGE_NAME in "${IMAGE_NAMES[@]}"; do
+  echo Docker building ${IMAGE_NAME}
+  $SUDO docker build -t git-lfs/$(basename ${IMAGE_NAME%.*}) -f ${IMAGE_NAME} ${CUR_DIR}
 done
 
diff --git a/docker/git-lfs-full-build_centos_5/Dockerfile b/docker/git-lfs-full-build_centos_5.dockerfile
similarity index 100%
rename from docker/git-lfs-full-build_centos_5/Dockerfile
rename to docker/git-lfs-full-build_centos_5.dockerfile
diff --git a/docker/git-lfs-full-build_centos_6/Dockerfile b/docker/git-lfs-full-build_centos_6.dockerfile
similarity index 100%
rename from docker/git-lfs-full-build_centos_6/Dockerfile
rename to docker/git-lfs-full-build_centos_6.dockerfile
diff --git a/docker/git-lfs-full-build_centos_7/Dockerfile b/docker/git-lfs-full-build_centos_7.dockerfile
similarity index 100%
rename from docker/git-lfs-full-build_centos_7/Dockerfile
rename to docker/git-lfs-full-build_centos_7.dockerfile
diff --git a/docker/git-lfs-test_centos_5/Dockerfile b/docker/git-lfs-test_centos_5.dockerfile
similarity index 100%
rename from docker/git-lfs-test_centos_5/Dockerfile
rename to docker/git-lfs-test_centos_5.dockerfile
diff --git a/docker/git-lfs-test_centos_6/Dockerfile b/docker/git-lfs-test_centos_6.dockerfile
similarity index 100%
rename from docker/git-lfs-test_centos_6/Dockerfile
rename to docker/git-lfs-test_centos_6.dockerfile
diff --git a/docker/git-lfs-test_centos_7/Dockerfile b/docker/git-lfs-test_centos_7.dockerfile
similarity index 100%
rename from docker/git-lfs-test_centos_7/Dockerfile
rename to docker/git-lfs-test_centos_7.dockerfile
diff --git a/docker/git-lfs-test_debian_7/Dockerfile b/docker/git-lfs-test_debian_7.dockerfile
similarity index 100%
rename from docker/git-lfs-test_debian_7/Dockerfile
rename to docker/git-lfs-test_debian_7.dockerfile
diff --git a/docker/git-lfs-test_debian_8/Dockerfile b/docker/git-lfs-test_debian_8.dockerfile
similarity index 100%
rename from docker/git-lfs-test_debian_8/Dockerfile
rename to docker/git-lfs-test_debian_8.dockerfile
diff --git a/docker/git-lfs_centos_5/Dockerfile b/docker/git-lfs_centos_5.dockerfile
similarity index 100%
rename from docker/git-lfs_centos_5/Dockerfile
rename to docker/git-lfs_centos_5.dockerfile
diff --git a/docker/git-lfs_centos_6/Dockerfile b/docker/git-lfs_centos_6.dockerfile
similarity index 100%
rename from docker/git-lfs_centos_6/Dockerfile
rename to docker/git-lfs_centos_6.dockerfile
diff --git a/docker/git-lfs_centos_7/Dockerfile b/docker/git-lfs_centos_7.dockerfile
similarity index 100%
rename from docker/git-lfs_centos_7/Dockerfile
rename to docker/git-lfs_centos_7.dockerfile
diff --git a/docker/git-lfs_debian_7/Dockerfile b/docker/git-lfs_debian_7.dockerfile
similarity index 100%
rename from docker/git-lfs_debian_7/Dockerfile
rename to docker/git-lfs_debian_7.dockerfile
diff --git a/docker/git-lfs_debian_8/Dockerfile b/docker/git-lfs_debian_8.dockerfile
similarity index 100%
rename from docker/git-lfs_debian_8/Dockerfile
rename to docker/git-lfs_debian_8.dockerfile
diff --git a/docker/run_dockers.bsh b/docker/run_dockers.bsh
index bb2420b761..c7424e0267 100755
--- a/docker/run_dockers.bsh
+++ b/docker/run_dockers.bsh
@@ -29,14 +29,10 @@ PACKAGE_DIR=${REPO_DIR}/repos
 : ${SUDO=`if ( [ ! -w /var/run/docker.sock ] && id -nG | grep -qwv docker && [ "${DOCKER_HOST:+dh}" != "dh" ] ) && which sudo > /dev/null 2>&1; then echo sudo; fi`}
 
 function split_image_name()
-{ #$1 - image directory name or dockerfile
+{ #$1 - image dockerfile
   #sets IMAGE_NAME to the basename of the dir containing the docker file
   #sets IMAGE_INFO to be the array name following my pattern
-  IMAGE_NAME=$(basename $1)
-  if [ "${IMAGE_NAME,,}" == "dockerfile" ]; then
-    IMAGE_NAME=$(basename $(dirname $1))
-  fi
-  
+  IMAGE_NAME=$(basename ${1%.*})
   local IFS=_
   IMAGE_INFO=(${IMAGE_NAME})
 }
@@ -55,7 +51,7 @@ while [[ $# > 0 ]]; do
 done
 
 if [[ ${#IMAGES[@]} == 0 ]]; then
-  IMAGES=($(ls -d ${CUR_DIR}/git-lfs_*/Dockerfile))
+  IMAGES=($(ls -d ${CUR_DIR}/git-lfs_*.dockerfile))
 fi
 
 mkdir -p "${PACKAGE_DIR}"