diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 30f5003..1c07758 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -3,35 +3,42 @@ name: Docker Publish
 on:
   workflow_dispatch:
   push:
-    branches: ["main", "master"]
+    branches: "main"
+    paths:
+      - Dockerfile*
   schedule:
-    - cron: "0 23 * * *"
+    - cron: "0 2 * * 6"
 
 jobs:
-  ubuntu-2204:
+  build-ubuntu-2204:
+    name: Build Ubuntu 22.04
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up QEMU
+
+      - name: Setup QEMU
         uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
+
+      - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2.7.0
+
       - name: Build
         run: docker build -t gameservermanagers/linuxgsm:ubuntu-22.04 -f ./Dockerfile.ubuntu-2204 .
-      #- name: Test
-      #  run: docker run --rm gameservermanagers/linuxgsm:ubuntu-22.04 ./linuxgsm.sh list
+
       - name: Login to DockerHub
         uses: docker/login-action@v2.2.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and push (Ubuntu 22.04)
         uses: docker/build-push-action@v4.1.1
         with:
@@ -41,34 +48,41 @@ jobs:
           push: true
           tags: |
             gameservermanagers/linuxgsm:latest
+            gameservermanagers/linuxgsm:ubuntu
             gameservermanagers/linuxgsm:ubuntu-22.04
             ghcr.io/gameservermanagers/linuxgsm:latest
+            ghcr.io/gameservermanagers/linuxgsm:ubuntu
             ghcr.io/gameservermanagers/linuxgsm:ubuntu-22.04
 
-  ubuntu-2004:
+  build-ubuntu-2004:
+    name: Build Ubuntu 20.04
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up QEMU
+
+      - name: Setup QEMU
         uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
+
+      - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2.7.0
+
       - name: Build
         run: docker build -t gameservermanagers/linuxgsm:ubuntu-20.04 -f ./Dockerfile.ubuntu-2004 .
-      #- name: Test
-      #  run: docker run --rm gameservermanagers/linuxgsm:ubuntu-20.04 ./linuxgsm.sh list
+
       - name: Login to DockerHub
         uses: docker/login-action@v2.2.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and push (Ubuntu 20.04)
         uses: docker/build-push-action@v4.1.1
         with:
@@ -80,30 +94,35 @@ jobs:
             gameservermanagers/linuxgsm:ubuntu-20.04
             ghcr.io/gameservermanagers/linuxgsm:ubuntu-20.04
 
-  ubuntu-1804:
+  build-ubuntu-1804:
+    name: Build Ubuntu 18.04
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up QEMU
+
+      - name: Setup QEMU
         uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
+
+      - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2.7.0
+
       - name: Build
         run: docker build -t gameservermanagers/linuxgsm:ubuntu-18.04 -f ./Dockerfile.ubuntu-1804 .
-      #- name: Test
-      #  run: docker run --rm gameservermanagers/linuxgsm:ubuntu-18.04 ./linuxgsm.sh list
+
       - name: Login to DockerHub
         uses: docker/login-action@v2.2.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build and push (Ubuntu 18.04)
         uses: docker/build-push-action@v4.1.1
         with: