diff --git a/.gitea/workflows/docker.18.04.yaml b/.gitea/workflows/docker.18.04.yaml
index 32105ef..e89e04b 100644
--- a/.gitea/workflows/docker.18.04.yaml
+++ b/.gitea/workflows/docker.18.04.yaml
@@ -30,6 +30,7 @@ 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
@@ -82,3 +83,4 @@ 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 b9f8d23..85161f6 100644
--- a/.gitea/workflows/docker.20.04.yaml
+++ b/.gitea/workflows/docker.20.04.yaml
@@ -30,6 +30,7 @@ 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
@@ -82,3 +83,4 @@ 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 2a18317..236006b 100644
--- a/.gitea/workflows/docker.22.04.yaml
+++ b/.gitea/workflows/docker.22.04.yaml
@@ -30,6 +30,7 @@ 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
@@ -82,3 +83,4 @@ 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 583bb79..1cdb1d7 100644
--- a/.gitea/workflows/docker.24.04.yaml
+++ b/.gitea/workflows/docker.24.04.yaml
@@ -30,6 +30,7 @@ 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
@@ -82,3 +83,4 @@ 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 6080c8e..c0bb66a 100644
--- a/.gitea/workflows/docker.24.10.yaml
+++ b/.gitea/workflows/docker.24.10.yaml
@@ -30,6 +30,7 @@ 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
@@ -82,3 +83,4 @@ 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 21e1223..84eb31a 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -30,6 +30,7 @@ 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
@@ -83,3 +84,4 @@ 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 99fec65..1d9def5 100644
--- a/.github/workflows/docker.18.04.yaml
+++ b/.github/workflows/docker.18.04.yaml
@@ -31,6 +31,7 @@ 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
@@ -83,3 +84,4 @@ 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 852b92f..e336481 100644
--- a/.github/workflows/docker.20.04.yaml
+++ b/.github/workflows/docker.20.04.yaml
@@ -31,6 +31,7 @@ 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
@@ -83,3 +84,4 @@ 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 fac2b85..2f43b94 100644
--- a/.github/workflows/docker.22.04.yaml
+++ b/.github/workflows/docker.22.04.yaml
@@ -31,6 +31,7 @@ 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
@@ -83,3 +84,4 @@ 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 646d960..a92a1ea 100644
--- a/.github/workflows/docker.24.04.yaml
+++ b/.github/workflows/docker.24.04.yaml
@@ -31,6 +31,7 @@ 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
@@ -83,3 +84,4 @@ 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 42db8a9..036bf6b 100644
--- a/.github/workflows/docker.24.10.yaml
+++ b/.github/workflows/docker.24.10.yaml
@@ -31,6 +31,7 @@ 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
@@ -83,3 +84,4 @@ 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 6891473..52a2e13 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -31,6 +31,7 @@ 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
@@ -84,3 +85,4 @@ 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 }}