diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 5a560c1..e3143a7 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -6,7 +6,7 @@ on:
       - main
       - master
   schedule:
-    - cron: '0 2 2 * *'
+    - cron: '0 2 * * 1'
 
 jobs:
   build-and-push:
@@ -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
@@ -84,4 +83,3 @@ jobs:
           tags: |
             docker.io/casjaysdev/archlinux:latest
             docker.io/casjaysdev/archlinux:${{ steps.meta.outputs.DATE_TAG }}
-            docker.io/casjaysdev/archlinux:${{ steps.meta.outputs.COMMIT_ID }}
diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
index d5ce9a2..5b83d1b 100644
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@@ -6,7 +6,7 @@ on:
       - main
       - master
   schedule:
-    - cron: '0 2 * * 1'
+    - cron: '0 2 2 * *'
 
 jobs:
   build-and-push:
@@ -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
@@ -56,8 +55,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=base
+            org.opencontainers.image.version=latest
             org.opencontainers.image.revision=${{ github.sha }}
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
-            docker.io/casjaysdev/archlinux:base
+            docker.io/casjaysdev/archlinux:latest
+            docker.io/casjaysdev/archlinux:${{ steps.meta.outputs.DATE_TAG }}
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index da657b7..cde9371 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -7,7 +7,7 @@ on:
       - master
   pull_request:
   schedule:
-    - cron: '0 2 2 * *'
+    - cron: '0 2 * * 1'
   workflow_dispatch:
 
 jobs:
@@ -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
@@ -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 }}