diff --git a/Dockerfile b/Dockerfile
index 69d44df..d1954a1 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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.18.04 b/Dockerfile.18.04
index d7c949e..65b9f95 100644
--- a/Dockerfile.18.04
+++ b/Dockerfile.18.04
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.19.04 b/Dockerfile.19.04
index 7694a8f..547f499 100644
--- a/Dockerfile.19.04
+++ b/Dockerfile.19.04
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.20.04 b/Dockerfile.20.04
index 017165b..55a6df0 100644
--- a/Dockerfile.20.04
+++ b/Dockerfile.20.04
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.21.04 b/Dockerfile.21.04
index 01276a8..fac71c6 100644
--- a/Dockerfile.21.04
+++ b/Dockerfile.21.04
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.22.04 b/Dockerfile.22.04
index da130c1..4b7074a 100644
--- a/Dockerfile.22.04
+++ b/Dockerfile.22.04
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.23.04 b/Dockerfile.23.04
index 516e3fb..5fb57c6 100644
--- a/Dockerfile.23.04
+++ b/Dockerfile.23.04
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.23.10 b/Dockerfile.23.10
index 9fca8aa..aa9f1e5 100644
--- a/Dockerfile.23.10
+++ b/Dockerfile.23.10
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.24.04 b/Dockerfile.24.04
index 46ae10e..46684dd 100644
--- a/Dockerfile.24.04
+++ b/Dockerfile.24.04
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"
diff --git a/Dockerfile.24.10 b/Dockerfile.24.10
index bc1276d..c264c3b 100644
--- a/Dockerfile.24.10
+++ b/Dockerfile.24.10
@@ -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/ubuntu"
 LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/ubuntu"
 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/ubuntu"
 LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/ubuntu"
 LABEL com.github.containers.toolbox="false"