diff --git a/.github/workflows/build-micro-service-manual.yml b/.github/workflows/build-micro-service-manual.yml
index e3eb3ba6b..7773548ef 100644
--- a/.github/workflows/build-micro-service-manual.yml
+++ b/.github/workflows/build-micro-service-manual.yml
@@ -11,8 +11,8 @@ on:
           - "kmsserver"
           - "verification-service"
           - "qemu-metadata-api"
-          - "filebeat-debug"
-          - "logstash-debug"
+          - "filebeat-debugd"
+          - "logstash-debugd"
         required: true
         default: "join-service"
       imageTag:
@@ -55,9 +55,9 @@ jobs:
               echo "microServiceDockerfile=verify/Dockerfile" >> "$GITHUB_ENV" ;;
             "qemu-metadata-api" )
               echo "microServiceDockerfile=hack/qemu-metadata-api/Dockerfile" >> "$GITHUB_ENV" ;;
-            "filebeat-debug" )
+            "filebeat-debugd" )
               echo "microServiceDockerfile=debugd/internal/debugd/logcollector/filebeat/Dockerfile" >> "$GITHUB_ENV" ;;
-            "logstash-debug" )
+            "logstash-debugd" )
               echo "microServiceDockerfile=debugd/internal/debugd/logcollector/logstash/Dockerfile" >> "$GITHUB_ENV" ;;
           esac
 
diff --git a/internal/versions/versions.go b/internal/versions/versions.go
index 1dae967e0..cef0a0582 100644
--- a/internal/versions/versions.go
+++ b/internal/versions/versions.go
@@ -76,9 +76,9 @@ const (
 	LibvirtImage = "ghcr.io/edgelesssys/constellation/libvirt:v2.2.0@sha256:81ddc30cd679a95379e94e2f154861d9112bcabfffa96330c09a4917693f7cce" // renovate:container
 
 	// LogstashImage is the container image of logstash, used for log collection by debugd.
-	LogstashImage = "ghcr.io/edgelesssys/constellation/logstash-debug:latest" // renovate:container
+	LogstashImage = "ghcr.io/edgelesssys/constellation/logstash-debugd:latest" // renovate:container
 	// FilebeatImage is the container image of filebeat, used for log collection by debugd.
-	FilebeatImage = "ghcr.io/edgelesssys/constellation/filebeat-debug:latest" // renovate:container
+	FilebeatImage = "ghcr.io/edgelesssys/constellation/filebeat-debugd:latest" // renovate:container
 
 	// currently supported versions.
 	//nolint:revive