diff --git a/build-alpine-glibc.jenkins b/build-alpine-glibc.jenkins
index 1c1c53c..bfb1759 100644
--- a/build-alpine-glibc.jenkins
+++ b/build-alpine-glibc.jenkins
@@ -15,7 +15,7 @@ def TimeZone = "America/Chicago"
 def dockerFile = """
 FROM registry.c.test-chamber-13.lan/library/alpine:latest
 
-LABEL org.opencontainers.image.authors="The_Spider <spider@smoothnet.org>"
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
 
 ARG TZ
 ARG LANG
diff --git a/build-alpine.jenkins b/build-alpine.jenkins
index a3808bb..95f4d6d 100644
--- a/build-alpine.jenkins
+++ b/build-alpine.jenkins
@@ -14,6 +14,8 @@ def repositoryCreds = "harbor-repository-creds"
 
 def dockerFile = """FROM ${repository}/dockerhub/library/alpine:latest
 
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
+
 COPY test-chamber-13.lan.root.crt /usr/local/share/ca-certificates/test-chamber-13.lan.root.crt
 
 RUN apk add --no-cache --virtual=.packagecache ca-certificates && \\
diff --git a/build-deluge.jenkins b/build-deluge.jenkins
index c1205a6..f9cd977 100644
--- a/build-deluge.jenkins
+++ b/build-deluge.jenkins
@@ -40,7 +40,7 @@ fi
 """
 
 def dockerFile = """FROM ${repository}/linuxserver/linuxserver/deluge:amd64-latest
-#FROM ${repository}/dockerhub/linuxserver/deluge:amd64-version-2.0.3-2201906121747ubuntu18.04.1
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
 
 COPY connectivity_test.sh /root/connectivity_test.sh
 
diff --git a/build-factario-container.jenkins b/build-factario-container.jenkins
index 7031b00..c6d0547 100644
--- a/build-factario-container.jenkins
+++ b/build-factario-container.jenkins
@@ -46,7 +46,7 @@ fi
 def dockerFile = """
 FROM registry.c.test-chamber-13.lan/library/alpine-glibc:latest
 
-LABEL org.opencontainers.image.authors="The_Spider <spider@smoothnet.org>"
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
 
 ENV PORT=34197 \\
     RCON_PORT=27015 \\
diff --git a/build-kaniko.jenkins b/build-kaniko.jenkins
index 20373dc..7802b24 100644
--- a/build-kaniko.jenkins
+++ b/build-kaniko.jenkins
@@ -16,6 +16,8 @@ def repositoryCreds = "harbor-repository-creds"
 
 def dockerFile = """FROM ${repository}/google/kaniko-project/executor:debug
 
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
+
 COPY ./kaniko-chain.crt /kaniko/ssl/certs/ca-certificates.crt
 """
 
diff --git a/build-minecraft.jenkins b/build-minecraft.jenkins
index 9725430..b815533 100644
--- a/build-minecraft.jenkins
+++ b/build-minecraft.jenkins
@@ -18,7 +18,7 @@ RUN addgroup -S -g 1000 minecraft && \\
 
 FROM registry.c.test-chamber-13.lan/google/distroless/java17:latest
 
-LABEL org.opencontainers.image.authors="The_Spider <spider@smoothnet.org>"
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
 
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /etc/passwd /etc/group /etc/
diff --git a/build-projectzomboid.jenkins b/build-projectzomboid.jenkins
index d498015..e8805db 100644
--- a/build-projectzomboid.jenkins
+++ b/build-projectzomboid.jenkins
@@ -48,6 +48,8 @@ podTemplate(
                 def dockerfile = """
 FROM ${repository}/dockerhub/cm2network/steamcmd:latest
 
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
+
 ARG STEAM_USER
 ARG STEAM_PASS
 ARG STEAM_TOKEN
diff --git a/build-rcon.jenkins b/build-rcon.jenkins
index 9f3fe46..7ada7a6 100644
--- a/build-rcon.jenkins
+++ b/build-rcon.jenkins
@@ -5,6 +5,8 @@ def repositoryCreds = "harbor-repository-creds"
 
 def dockerFile = """FROM ${repository}/library/alpine:latest as builder
 
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
+
 RUN apk add --no-cache curl jq && \\
     VER=\$(curl --silent "https://api.github.com/repos/gorcon/rcon-cli/releases/latest" | jq -r '.tag_name' | sed -r 's/v//') && \\
     curl --silent \\
diff --git a/build-satasfactory.jenkins b/build-satasfactory.jenkins
index 189cc67..1c7d73b 100644
--- a/build-satasfactory.jenkins
+++ b/build-satasfactory.jenkins
@@ -4,6 +4,8 @@ def repositoryCreds = "harbor-repository-creds"
 def dockerFile = """
 FROM ${repository}/dockerhub/cm2network/steamcmd:latest
 
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
+
 EXPOSE 15777/udp
 EXPOSE 15000/udp
 EXPOSE 777/udp
diff --git a/build-ubi.jenkins b/build-ubi.jenkins
index 796c853..8d12dd4 100644
--- a/build-ubi.jenkins
+++ b/build-ubi.jenkins
@@ -32,6 +32,8 @@ podTemplate (
                 }
                 def dockerFile = """FROM registry.access.redhat.com/ubi${rhOS}/${image}:latest
 
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
+
 COPY test-chamber-13.lan.root.crt /etc/pki/ca-trust/source/anchors/test-chamber-13.lan.root.crt
 
 RUN update-ca-trust extract && \\
diff --git a/build-vlmcsd.jenkins b/build-vlmcsd.jenkins
index 3fe4277..ae9dc1d 100644
--- a/build-vlmcsd.jenkins
+++ b/build-vlmcsd.jenkins
@@ -6,6 +6,8 @@ def repositoryCreds = "harbor-repository-creds"
 def dockerFile = """
 FROM ${repository}/library/alpine:latest
 
+LABEL maintainer="The_Spider <spider@smoothnet.org>"
+
 RUN apk add --no-cache openssl && \\
     addgroup -g 1000 -S vlmcsd && \\
     adduser -u 1000 -G vlmcsd -S -D -h /home/vlmcsd vlmcsd