diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index e89045d..9216002 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,6 +1,7 @@
 name: Docker Publish
 
 on:
+  workflow_dispatch:
   push:
     branches: ["main", "master"]
     paths:
@@ -19,9 +20,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.2.1
       - name: Build
-        run: docker build -t gameservermanagers/steamcmd:ubuntu-22.04 .
+        run: docker build -t gameservermanagers/steamcmd:ubuntu-22.04 -f ./Dockerfile.ubuntu-2204 .
       - name: Test
-        run: docker run --rm gameservermanagers/steamcmd:ubuntu-22.04
+        run: docker run --rm gameservermanagers/steamcmd:ubuntu-22.04 steamcmd +quit
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
         with:
@@ -58,9 +59,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.2.1
       - name: Build
-        run: docker build -t gameservermanagers/steamcmd:ubuntu-20.04 .
+        run: docker build -t gameservermanagers/steamcmd:ubuntu-20.04 -f ./Dockerfile.ubuntu-2004 .
       - name: Test
-        run: docker run --rm gameservermanagers/steamcmd:ubuntu-20.04
+        run: docker run --rm gameservermanagers/steamcmd:ubuntu-20.04 steamcmd +quit
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
         with:
@@ -93,9 +94,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.2.1
       - name: Build
-        run: docker build -t gameservermanagers/steamcmd:ubuntu-18.04 .
+        run: docker build -t gameservermanagers/steamcmd:ubuntu-18.04 -f  ./Dockerfile.ubuntu-1804 .
       - name: Test
-        run: docker run --rm gameservermanagers/steamcmd:ubuntu-18.04
+        run: docker run --rm gameservermanagers/steamcmd:ubuntu-18.04 steamcmd +quit
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
         with: