diff --git a/docker/promtail-config.template.yaml b/docker/promtail-config.template.yaml
index 45ac4bfb..d1802254 100644
--- a/docker/promtail-config.template.yaml
+++ b/docker/promtail-config.template.yaml
@@ -32,10 +32,10 @@ scrape_configs:
         regex: '/(.*)'
         target_label: 'container_name'
 
-      # 4. 서비스 상세 라벨 부여 (baron_ 접두사 제거 등)
+      # 4. 서비스 상세 라벨 부여 (baron_ 접두사 제거 등, 접두사가 없는 경우 그대로 유지)
       - source_labels: ['container_name']
-        regex: 'baron_(.*)'
+        regex: '(?:baron_)?(.*)'
         target_label: 'service'
       - source_labels: ['container_name']
-        regex: 'baron_(.*)'
+        regex: '(?:baron_)?(.*)'
         target_label: 'job'
diff --git a/docs/external_healthcheck_monitoring_design.md b/docs/external_healthcheck_monitoring_design.md
index c1b644be..f66d65c9 100644
--- a/docs/external_healthcheck_monitoring_design.md
+++ b/docs/external_healthcheck_monitoring_design.md
@@ -140,12 +140,12 @@ scrape_configs:
       - source_labels: ['container_name']
         regex: '(baron_.*|oathkeeper|kratos|hydra|keto)'
         action: keep
-      # 컨테이너 명에서 앞의 접두사를 떼어 서비스 및 잡 라벨 부여 (예: baron_backend -> backend)
+      # 컨테이너 명에서 앞의 접두사를 떼어 서비스 및 잡 라벨 부여 (예: baron_backend -> backend, kratos -> kratos)
       - source_labels: ['container_name']
-        regex: 'baron_(.*)'
+        regex: '(?:baron_)?(.*)'
         target_label: 'service'
       - source_labels: ['container_name']
-        regex: 'baron_(.*)'
+        regex: '(?:baron_)?(.*)'
         target_label: 'job'
       # 동적 라벨 추가
       - target_label: 'app_env'