diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 9e246f1..d5faffb 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -13,9 +13,10 @@ jobs:
     strategy:
       matrix:
         base-image:
-          - quay.io/kairos/core-opensuse:v1.1.0
-          - quay.io/kairos/core-alpine:v1.1.0
-          - quay.io/kairos/core-ubuntu:v1.1.0
+          - quay.io/kairos/core-opensuse:v1.1.1
+          - quay.io/kairos/core-alpine:v1.1.1
+          - quay.io/kairos/core-ubuntu-20-lts:v1.1.1
+          - quay.io/kairos/core-ubuntu-22-lts:v1.1.1
         k3s-version:
           - v1.25.2+k3s1
           - v1.24.6+k3s1
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
index d7736fd..ee595cb 100644
--- a/.github/workflows/pull_request.yaml
+++ b/.github/workflows/pull_request.yaml
@@ -26,9 +26,10 @@ jobs:
     strategy:
       matrix:
         base-image:
-          - quay.io/kairos/core-opensuse:latest
-          - quay.io/kairos/core-alpine:latest
-          - quay.io/kairos/core-ubuntu:latest
+          - quay.io/kairos/core-opensuse:v1.1.1
+          - quay.io/kairos/core-alpine:v1.1.1
+          - quay.io/kairos/core-ubuntu-20-lts:v1.1.1
+          - quay.io/kairos/core-ubuntu-22-lts:v1.1.1
         k3s-version:
           - v1.25.0+k3s1
     steps:
diff --git a/Earthfile b/Earthfile
index 9225b58..475b458 100644
--- a/Earthfile
+++ b/Earthfile
@@ -86,9 +86,8 @@ docker:
     ENV OS_LABEL=${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}_${VERSION}
     RUN envsubst >/etc/os-release </usr/lib/os-release.tmpl
 
-    SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}
-    SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}
-    SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}_${VERSION}
+    SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${K3S_VERSION_TAG}
+    SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${K3S_VERSION_TAG}_${VERSION}
 
 cosign:
     ARG --required ACTIONS_ID_TOKEN_REQUEST_TOKEN
@@ -115,9 +114,8 @@ cosign:
 
     RUN echo $REGISTRY_PASSWORD | docker login -u $REGISTRY_USER --password-stdin $REGISTRY
 
-    RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}
-    RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}
-    RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}_${VERSION}
+    RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${K3S_VERSION_TAG}
+    RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${K3S_VERSION_TAG}_${VERSION}
 
 docker-all-platforms:
      BUILD --platform=linux/amd64 +docker