diff --git a/Dockerfile b/Dockerfile
index bbe713d..0edba6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -208,7 +208,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdev/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/alpine"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.3.14 b/Dockerfile.3.14
index 30f771f..80083d5 100644
--- a/Dockerfile.3.14
+++ b/Dockerfile.3.14
@@ -208,7 +208,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/alpine"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.3.15 b/Dockerfile.3.15
index ee88da3..f1eb281 100644
--- a/Dockerfile.3.15
+++ b/Dockerfile.3.15
@@ -208,7 +208,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/alpine"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.3.16 b/Dockerfile.3.16
index 0a2951d..ee6b6fe 100644
--- a/Dockerfile.3.16
+++ b/Dockerfile.3.16
@@ -208,7 +208,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/alpine"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.3.17 b/Dockerfile.3.17
index 296afd8..7719328 100644
--- a/Dockerfile.3.17
+++ b/Dockerfile.3.17
@@ -208,7 +208,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/alpine"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.3.18 b/Dockerfile.3.18
index 63dbeaf..9c70edf 100644
--- a/Dockerfile.3.18
+++ b/Dockerfile.3.18
@@ -208,7 +208,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/alpine"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.3.19 b/Dockerfile.3.19
index 831b6bb..a2011ef 100644
--- a/Dockerfile.3.19
+++ b/Dockerfile.3.19
@@ -208,7 +208,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/alpine"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.3.20 b/Dockerfile.3.20
index ae0bb12..43ca4c1 100644
--- a/Dockerfile.3.20
+++ b/Dockerfile.3.20
@@ -208,7 +208,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/alpine"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.edge b/Dockerfile.edge
index 947f438..d0bb685 100644
--- a/Dockerfile.edge
+++ b/Dockerfile.edge
@@ -203,7 +203,6 @@ ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
 ARG ENV_PORTS=""
-ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')"
 
 USER ${USER}
 WORKDIR /root
@@ -221,7 +220,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
-LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
 LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/alpine"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/alpine"
 LABEL com.github.containers.toolbox="false"