diff --git a/.gitea/workflows/docker.18.04.yaml b/.gitea/workflows/docker.18.04.yaml
index e89e04b..85b359c 100644
--- a/.gitea/workflows/docker.18.04.yaml
+++ b/.gitea/workflows/docker.18.04.yaml
@@ -30,7 +30,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -57,7 +56,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=18.04
             CONTAINER_VERSION=bionic
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -83,4 +82,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             docker.io/casjaysdev/ubuntu:18.04
-            docker.io/casjaysdev/ubuntu:bionic
diff --git a/.gitea/workflows/docker.20.04.yaml b/.gitea/workflows/docker.20.04.yaml
index 85161f6..fd447af 100644
--- a/.gitea/workflows/docker.20.04.yaml
+++ b/.gitea/workflows/docker.20.04.yaml
@@ -30,7 +30,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -57,7 +56,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=20.04
             CONTAINER_VERSION=focal
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -83,4 +82,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             docker.io/casjaysdev/ubuntu:20.04
-            docker.io/casjaysdev/ubuntu:focal
diff --git a/.gitea/workflows/docker.22.04.yaml b/.gitea/workflows/docker.22.04.yaml
index 236006b..b74b6fd 100644
--- a/.gitea/workflows/docker.22.04.yaml
+++ b/.gitea/workflows/docker.22.04.yaml
@@ -30,7 +30,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -57,7 +56,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=22.04
             CONTAINER_VERSION=jammy
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -83,4 +82,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             docker.io/casjaysdev/ubuntu:22.04
-            docker.io/casjaysdev/ubuntu:jammy
diff --git a/.gitea/workflows/docker.24.04.yaml b/.gitea/workflows/docker.24.04.yaml
index 1cdb1d7..ac400ed 100644
--- a/.gitea/workflows/docker.24.04.yaml
+++ b/.gitea/workflows/docker.24.04.yaml
@@ -30,7 +30,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -57,7 +56,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=24.04
             CONTAINER_VERSION=noble
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -83,4 +82,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             docker.io/casjaysdev/ubuntu:24.04
-            docker.io/casjaysdev/ubuntu:noble
diff --git a/.gitea/workflows/docker.24.10.yaml b/.gitea/workflows/docker.24.10.yaml
index c0bb66a..0aef78a 100644
--- a/.gitea/workflows/docker.24.10.yaml
+++ b/.gitea/workflows/docker.24.10.yaml
@@ -30,7 +30,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -57,7 +56,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=24.10
             CONTAINER_VERSION=oracular
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -83,4 +82,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             docker.io/casjaysdev/ubuntu:24.10
-            docker.io/casjaysdev/ubuntu:oracular
diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 84eb31a..6608d69 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -30,7 +30,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -57,7 +56,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=latest
             CONTAINER_VERSION=USE_DATE
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -84,4 +83,3 @@ jobs:
           tags: |
             docker.io/casjaysdev/ubuntu:latest
             docker.io/casjaysdev/ubuntu:${{ steps.meta.outputs.DATE_TAG }}
-            docker.io/casjaysdev/ubuntu:${{ steps.meta.outputs.COMMIT_ID }}
diff --git a/.github/workflows/docker.18.04.yaml b/.github/workflows/docker.18.04.yaml
index 1d9def5..e749431 100644
--- a/.github/workflows/docker.18.04.yaml
+++ b/.github/workflows/docker.18.04.yaml
@@ -31,7 +31,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -58,7 +57,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=18.04
             CONTAINER_VERSION=bionic
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -84,4 +83,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             ghcr.io/${{ github.repository }}:18.04
-            ghcr.io/${{ github.repository }}:bionic
diff --git a/.github/workflows/docker.20.04.yaml b/.github/workflows/docker.20.04.yaml
index e336481..dc6b07a 100644
--- a/.github/workflows/docker.20.04.yaml
+++ b/.github/workflows/docker.20.04.yaml
@@ -31,7 +31,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -58,7 +57,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=20.04
             CONTAINER_VERSION=focal
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -84,4 +83,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             ghcr.io/${{ github.repository }}:20.04
-            ghcr.io/${{ github.repository }}:focal
diff --git a/.github/workflows/docker.22.04.yaml b/.github/workflows/docker.22.04.yaml
index 2f43b94..af32a4e 100644
--- a/.github/workflows/docker.22.04.yaml
+++ b/.github/workflows/docker.22.04.yaml
@@ -31,7 +31,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -58,7 +57,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=22.04
             CONTAINER_VERSION=jammy
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -84,4 +83,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             ghcr.io/${{ github.repository }}:22.04
-            ghcr.io/${{ github.repository }}:jammy
diff --git a/.github/workflows/docker.24.04.yaml b/.github/workflows/docker.24.04.yaml
index a92a1ea..5c1c292 100644
--- a/.github/workflows/docker.24.04.yaml
+++ b/.github/workflows/docker.24.04.yaml
@@ -31,7 +31,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -58,7 +57,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=24.04
             CONTAINER_VERSION=noble
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -84,4 +83,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             ghcr.io/${{ github.repository }}:24.04
-            ghcr.io/${{ github.repository }}:noble
diff --git a/.github/workflows/docker.24.10.yaml b/.github/workflows/docker.24.10.yaml
index 036bf6b..8ba32cb 100644
--- a/.github/workflows/docker.24.10.yaml
+++ b/.github/workflows/docker.24.10.yaml
@@ -31,7 +31,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -58,7 +57,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=24.10
             CONTAINER_VERSION=oracular
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -84,4 +83,3 @@ jobs:
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             ghcr.io/${{ github.repository }}:24.10
-            ghcr.io/${{ github.repository }}:oracular
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 52a2e13..90911c3 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -31,7 +31,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -58,7 +57,7 @@ jobs:
             BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
             BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
             PULL_URL=ubuntu
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=latest
             CONTAINER_VERSION=USE_DATE
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -85,4 +84,3 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository }}:latest
             ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.DATE_TAG }}
-            ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.COMMIT_ID }}