diff --git a/.gitea/workflows/build-runner.yml b/.gitea/workflows/build-runner.yml
index 6979069..edb3924 100644
--- a/.gitea/workflows/build-runner.yml
+++ b/.gitea/workflows/build-runner.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build-and-push:
-    name: Build & Push LOGAR Runner Image
+    name: Build & Push Runner Image
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -29,8 +29,8 @@ jobs:
       - name: Log in to Gitea Container Registry
         run: |
           REGISTRY="gitea.eibl.tech"
-          USER="${{ secrets.GITEAUSER || secrets.PACKAGESUSER || secrets.packagesuser || github.actor || 'me0nline' }}"
-          PASS="${{ secrets.GITEATOKEN || secrets.giteatoken || secrets.PACKAGESTOKEN || secrets.packagestoken || secrets.TAG_TOKEN || github.token }}"
+          USER="${{ secrets.PACKAGESUSER || secrets.GITEAUSER || secrets.packagesuser || 'me0nline' }}"
+          PASS="${{ secrets.GITEATOKEN || secrets.PACKAGESTOKEN || secrets.packagestoken || 'f64c72025024b0628479b889d871eb764d812951' }}"
           echo "Logging in to ${REGISTRY} as ${USER}..."
           echo "${PASS}" | docker login "${REGISTRY}" -u "${USER}" --password-stdin
 
@@ -39,7 +39,9 @@ jobs:
           DOCKER_BUILDKIT: "0"
         run: |
           IMAGE_TAG="gitea.eibl.tech/me0nline/logar-runner:latest"
-          echo "Building ${IMAGE_TAG}..."
+          echo "Pulling base codechecker-runner image..."
+          docker pull gitea.eibl.tech/me0nline/codechecker-runner:latest || true
+          echo "Building ${IMAGE_TAG} on top of codechecker-runner..."
           docker build \
             -t "${IMAGE_TAG}" \
             -f runner/Dockerfile \
@@ -53,9 +55,8 @@ jobs:
           echo "Successfully pushed ${IMAGE_TAG} to Gitea Container Registry!"
 
       - name: Trigger Portainer redeploy via webhook
-        env:
-          PORTAINER_WEBHOOK: ${{ secrets.PORTAINER_WEBHOOK_RUNNER || 'https://portainer.eibl.tech/api/stacks/webhooks/6e67c0b7-1c5d-4bb2-b8b8-4a6ec66d3b87' }}
         run: |
           echo "Notifying Portainer to redeploy the runner stack..."
-          curl -s -X POST "${PORTAINER_WEBHOOK}" || true
+          curl -s -X POST \
+            "https://portainer.eibl.tech/api/stacks/webhooks/6e67c0b7-1c5d-4bb2-b8b8-4a6ec66d3b87"
           echo "✓ Portainer webhook triggered"