diff --git a/.github/workflows/publish-to-docker.yml b/.github/workflows/publish-to-docker.yml
index e69b002..93114a0 100644
--- a/.github/workflows/publish-to-docker.yml
+++ b/.github/workflows/publish-to-docker.yml
@@ -9,14 +9,30 @@ on:
     - cron: "10 6 * * *"
 
 jobs:
+
+  latest-build:
+    name: "Build latest"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@3.04
+        with:
+          name: ${{ secrets.DOCKER_REPO }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_GITHUB_TOKEN }}
+          dockerfile: Dockerfile
+          buildargs: BASE=buster
+          tags: "latest,buster"
+
   build:
+    name: "Build versions"
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
         perl-version:
-          - "latest"
           - "5.34"
           - "5.32"
           - "5.30"
@@ -41,5 +57,5 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_GITHUB_TOKEN }}
           dockerfile: Dockerfile
-          buildargs: BASE=${{ matrix.perl-version }}
+          buildargs: BASE=${{ matrix.perl-version }}-buster
           tags: "${{ matrix.perl-version }}"
diff --git a/.github/workflows/test-cpanfile.yml b/.github/workflows/test-cpanfile.yml
index 036cbc4..bf8a7ae 100644
--- a/.github/workflows/test-cpanfile.yml
+++ b/.github/workflows/test-cpanfile.yml
@@ -9,7 +9,7 @@ jobs:
   test-job:
     runs-on: ubuntu-latest
     container:
-      image: perl:${{ matrix.perl-version }}
+      image: perl:${{ matrix.perl-version }}-buster
     strategy:
       fail-fast: false
       matrix: