diff --git a/.github/workflows/dev.workflow.yaml b/.github/workflows/dev.workflow.yaml
index 0ec61e6..8d88866 100644
--- a/.github/workflows/dev.workflow.yaml
+++ b/.github/workflows/dev.workflow.yaml
@@ -16,31 +16,31 @@ jobs:
     environment:
       name: staging
     steps:
-      - name: checkout code
-        uses: actions/checkout@v2
-      # https://github.com/docker/setup-qemu-action
+      - name: "[preparation] checkout"
+        uses: actions/checkout@v4.1.1
+
       - name: "[preparation] set up golang"
         uses: actions/setup-go@v5.0.0
         with:
           go-version-file: go.mod
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      # https://github.com/docker/setup-buildx-action
+
+      - name: "[preparation] set up qemu"
+        uses: docker/setup-qemu-action@v3.2.0
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3.6.1
         with:
           driver-opts: image=moby/buildkit:v0.10.6
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "1.22.5"
+
       - name: login to docker hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-      - name: build the image to portainer ci with PR number
+      - name: "build the image to portainer ci with PR number (portainerci/portainer-updater:pr${{ github.event.pull_request.number }})"
         if: ${{ github.event.pull_request.number != '' }}
         run: |
           "${GITHUB_WORKSPACE}/build/build_and_push.sh" portainerci pr$GITHUB_PR_NUMBER
-      - name: build the image to portainer ci ( Develop Latest )
+
+      - name: "build the image to portainer ci (portainerci/portainer-updater:develop)"
         if: ${{ github.ref == 'refs/heads/develop' }}
         run: |
           "${GITHUB_WORKSPACE}/build/build_and_push.sh" portainerci develop
diff --git a/build/linux/Dockerfile b/build/linux/Dockerfile
index 55166c9..a5941b4 100644
--- a/build/linux/Dockerfile
+++ b/build/linux/Dockerfile
@@ -1,14 +1,8 @@
 ARG GIT_COMMIT=unspecified
-
-FROM alpine:3.6 as base
-RUN apk add -U --no-cache ca-certificates
-
-
-FROM scratch
+FROM portainer/base:latest
 
 LABEL git_commit=$GIT_COMMIT
 
-COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY dist /
 
 ENTRYPOINT [ "/portainer-updater" ]
\ No newline at end of file
diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile
index 7f23a4a..60f42cf 100644
--- a/build/windows/Dockerfile
+++ b/build/windows/Dockerfile
@@ -1,7 +1,7 @@
 ARG GIT_COMMIT=unspecified
 ARG OSVERSION
-FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} as core
-FROM --platform=linux/amd64 alpine:3.13.0 as downloader
+FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} AS core
+FROM --platform=linux/amd64 alpine:3.13.0 AS downloader
 ENV GIT_VERSION 2.46.0
 ENV GIT_PATCH_VERSION 1