diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2bcbbab0..6bd039260 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   **api-status** More comprehensive status check that both creates a lobby & connects to it
 -   More details in `CLAIMS_MISSING_ENTITLEMENT` error
 -   **API** Added 120s timeout to reading request body and writing response to all requests going through Traefik
+-   **Infra** Update Promtail logs to match k8s semantics
 
 ### Fixed
 
diff --git a/infra/tf/k8s_infra/promtail.tf b/infra/tf/k8s_infra/promtail.tf
index 1f2295151..411bf9394 100644
--- a/infra/tf/k8s_infra/promtail.tf
+++ b/infra/tf/k8s_infra/promtail.tf
@@ -1,11 +1,4 @@
 locals {
-	labels = {
-		ns = var.namespace
-	}
-	external_labels = join(",", [
-		for key, value in local.labels:
-		"${key}=${value}"
-	])
 	service_promtail = lookup(var.services, "promtail", {
 		count = 1
 		resources = {
@@ -56,15 +49,30 @@ resource "helm_release" "promtail" {
 				]
 				# NOTE: Do not add relabel configs to `common` below, add them here
 				extraRelabelConfigs = [
+					{
+						action = "replace"
+						source_labels = ["__meta_kubernetes_namespace"]
+						target_label = "namespace"
+					},
 					{
 						action = "replace"
 						source_labels = ["__meta_kubernetes_pod_node_name"]
 						target_label = "node"
 					},
+					{
+						action = "replace"
+						source_labels = ["__meta_kubernetes_pod_name"]
+						target_label = "pod"
+					},
 					{
 						action = "replace"
 						source_labels = ["__meta_kubernetes_pod_uid"]
-						target_label = "alloc"
+						target_label = "pod_uid"
+					},
+					{
+						action = "replace"
+						source_labels = ["__meta_kubernetes_pod_container_name"]
+						target_label = "container"
 					},
 					{
 						action = "replace"
@@ -72,9 +80,9 @@ resource "helm_release" "promtail" {
 						# https://groups.google.com/g/prometheus-users/c/dGx7MArW-eE
 						# https://github.com/prometheus/docs/issues/735
 						source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"]
-						target_label = "service"
+						target_label = "name"
 					},
-					# Doesn't work for some reason
+					# TODO: Doesn't work for some reason
 					{
 						action = "labeldrop"
 						regex = "^(host|filename)$"
@@ -139,9 +147,5 @@ resource "helm_release" "promtail" {
 				cpu = "${local.service_promtail.resources.cpu}m"
 			}
 		} : null
-
-		extraArgs = [
-			"-client.external-labels=${local.external_labels}"
-		]
 	})]
 }