diff --git a/.gitea/workflows/docker.3.14.yaml b/.gitea/workflows/docker.3.14.yaml
index ecae310..0c8d3f0 100644
--- a/.gitea/workflows/docker.3.14.yaml
+++ b/.gitea/workflows/docker.3.14.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.14
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.3.15.yaml b/.gitea/workflows/docker.3.15.yaml
index 8df8cde..f1d110b 100644
--- a/.gitea/workflows/docker.3.15.yaml
+++ b/.gitea/workflows/docker.3.15.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.15
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.3.16.yaml b/.gitea/workflows/docker.3.16.yaml
index 7931647..6e5e308 100644
--- a/.gitea/workflows/docker.3.16.yaml
+++ b/.gitea/workflows/docker.3.16.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.16
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.3.17.yaml b/.gitea/workflows/docker.3.17.yaml
index f909416..5fb9a0e 100644
--- a/.gitea/workflows/docker.3.17.yaml
+++ b/.gitea/workflows/docker.3.17.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.17
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.3.18.yaml b/.gitea/workflows/docker.3.18.yaml
index 2212b6b..5604f01 100644
--- a/.gitea/workflows/docker.3.18.yaml
+++ b/.gitea/workflows/docker.3.18.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.18
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.3.19.yaml b/.gitea/workflows/docker.3.19.yaml
index 0a446f0..46bf648 100644
--- a/.gitea/workflows/docker.3.19.yaml
+++ b/.gitea/workflows/docker.3.19.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.19
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.3.20.yaml b/.gitea/workflows/docker.3.20.yaml
index 82f0bce..bc8388a 100644
--- a/.gitea/workflows/docker.3.20.yaml
+++ b/.gitea/workflows/docker.3.20.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.20
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.3.21.yaml b/.gitea/workflows/docker.3.21.yaml
index 2dd179d..f2dcfeb 100644
--- a/.gitea/workflows/docker.3.21.yaml
+++ b/.gitea/workflows/docker.3.21.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.21
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.3.22.yaml b/.gitea/workflows/docker.3.22.yaml
index f2392d5..24e69ad 100644
--- a/.gitea/workflows/docker.3.22.yaml
+++ b/.gitea/workflows/docker.3.22.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.22
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.edge.yaml b/.gitea/workflows/docker.edge.yaml
index a5158fe..0afcd41 100644
--- a/.gitea/workflows/docker.edge.yaml
+++ b/.gitea/workflows/docker.edge.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=edge
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index f628ac6..d3eba82 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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.22
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -78,10 +77,9 @@ jobs:
             org.opencontainers.image.authors=CasjaysDev <docker-admin@casjaysdev.pro>
             org.opencontainers.image.url=https://github.com/${{ github.repository }}
             org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.version=latest
+            org.opencontainers.image.version=3.22
             org.opencontainers.image.revision=${{ github.sha }}
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             docker.io/casjaysdev/alpine:latest
             docker.io/casjaysdev/alpine:${{ steps.meta.outputs.DATE_TAG }}
-            docker.io/casjaysdev/alpine:${{ steps.meta.outputs.COMMIT_ID }}
diff --git a/.github/workflows/docker.3.14.yaml b/.github/workflows/docker.3.14.yaml
index 46db9c2..de23d5c 100644
--- a/.github/workflows/docker.3.14.yaml
+++ b/.github/workflows/docker.3.14.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.14
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.3.15.yaml b/.github/workflows/docker.3.15.yaml
index 687b7e3..fe73012 100644
--- a/.github/workflows/docker.3.15.yaml
+++ b/.github/workflows/docker.3.15.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.15
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.3.16.yaml b/.github/workflows/docker.3.16.yaml
index f93ee5f..fd868cf 100644
--- a/.github/workflows/docker.3.16.yaml
+++ b/.github/workflows/docker.3.16.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.16
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.3.17.yaml b/.github/workflows/docker.3.17.yaml
index ee705fa..e91f7ca 100644
--- a/.github/workflows/docker.3.17.yaml
+++ b/.github/workflows/docker.3.17.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.17
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.3.18.yaml b/.github/workflows/docker.3.18.yaml
index 170e551..cc2ede4 100644
--- a/.github/workflows/docker.3.18.yaml
+++ b/.github/workflows/docker.3.18.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.18
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.3.19.yaml b/.github/workflows/docker.3.19.yaml
index 696b3d7..0dfa8cb 100644
--- a/.github/workflows/docker.3.19.yaml
+++ b/.github/workflows/docker.3.19.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.19
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.3.20.yaml b/.github/workflows/docker.3.20.yaml
index ac7fd26..f487614 100644
--- a/.github/workflows/docker.3.20.yaml
+++ b/.github/workflows/docker.3.20.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.20
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.3.21.yaml b/.github/workflows/docker.3.21.yaml
index 3ffce3b..9cab0c9 100644
--- a/.github/workflows/docker.3.21.yaml
+++ b/.github/workflows/docker.3.21.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.21
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.3.22.yaml b/.github/workflows/docker.3.22.yaml
index a3197d2..e11f949 100644
--- a/.github/workflows/docker.3.22.yaml
+++ b/.github/workflows/docker.3.22.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.22
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.edge.yaml b/.github/workflows/docker.edge.yaml
index 228e520..0b0d7ae 100644
--- a/.github/workflows/docker.edge.yaml
+++ b/.github/workflows/docker.edge.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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=edge
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index f410e33..ce8ba64 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=alpine
-            DISTRO_VERSION=${IMAGE_VERSION}
+            DISTRO_VERSION=3.22
             CONTAINER_VERSION=
             TIMEZONE=America/New_York
             LANGUAGE=en_US.UTF-8
@@ -79,10 +78,9 @@ jobs:
             org.opencontainers.image.authors=CasjaysDev <docker-admin@casjaysdev.pro>
             org.opencontainers.image.url=https://github.com/${{ github.repository }}
             org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.version=latest
+            org.opencontainers.image.version=3.22
             org.opencontainers.image.revision=${{ github.sha }}
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
             ghcr.io/${{ github.repository }}:latest
             ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.DATE_TAG }}
-            ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.COMMIT_ID }}