diff --git a/.github/workflows/container-push.yml b/.github/workflows/container-push.yml
index 5c6fee6..d78aaa3 100644
--- a/.github/workflows/container-push.yml
+++ b/.github/workflows/container-push.yml
@@ -11,7 +11,7 @@ jobs:
       contents: read
       packages: write
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: docker-compose build
       run: docker-compose -f docker-compose.yml -f docker-compose.ci.yml build --build-arg GIT_COMMIT_HASH=${{ github.sha }}
       env:
diff --git a/agent.Dockerfile b/agent.Dockerfile
index 4868dea..6807cec 100644
--- a/agent.Dockerfile
+++ b/agent.Dockerfile
@@ -42,9 +42,9 @@ COPY tests tests
 COPY src src
 ARG GIT_COMMIT_HASH=-
 ENV GIT_COMMIT_HASH=${GIT_COMMIT_HASH}
-RUN cargo build --release --bin agent
+RUN cargo build --release --bin agent --bin mgmt-server
 
-FROM debian:bookworm-slim AS runtime
+FROM debian:bookworm-slim AS agent-runtime
 WORKDIR /app
 RUN apt-get update \
     && apt-get install -y ca-certificates
diff --git a/mgmt-server.Dockerfile b/mgmt-server.Dockerfile
index b9e8c35..6e5000d 100644
--- a/mgmt-server.Dockerfile
+++ b/mgmt-server.Dockerfile
@@ -26,7 +26,7 @@ RUN apt-get update \
     && NODE_MAJOR=20 \
     && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 RUN apt-get update \
-    && apt-get install -y clang nodejs openjdk-17-jre-headless libgit2-1.5
+    && apt-get install -y clang nodejs openjdk-17-jre-headless
 COPY openapitools.json .
 COPY package-lock.json .
 COPY package.json .
@@ -42,7 +42,7 @@ COPY tests tests
 COPY src src
 ARG GIT_COMMIT_HASH=-
 ENV GIT_COMMIT_HASH=${GIT_COMMIT_HASH}
-RUN cargo build --release --bin mgmt-server
+RUN cargo build --release --bin agent --bin mgmt-server
 
 FROM node:lts-alpine AS web-builder
 WORKDIR /app/web
@@ -53,7 +53,7 @@ COPY web /app/web
 COPY openapi /app/openapi
 RUN npm run build -- --configuration production
 
-FROM debian:bookworm-slim AS runtime
+FROM debian:bookworm-slim AS mgmt-server-runtime
 WORKDIR /app
 RUN apt-get update \
     && apt-get install -y ca-certificates