diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 80e84851b4..0f2ddfb640 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -225,6 +225,8 @@ def _serialized_v1_span_to_serialized_v2_span(
         attributes["sentry.release"] = event["release"]
     if "environment" in event:
         attributes["sentry.environment"] = event["environment"]
+    if "server_name" in event:
+        attributes["server.address"] = event["server_name"]
     if "transaction" in event:
         attributes["sentry.segment.name"] = event["transaction"]
 
diff --git a/tests/integrations/huggingface_hub/test_huggingface_hub.py b/tests/integrations/huggingface_hub/test_huggingface_hub.py
index d46b2d799b..028e710ad2 100644
--- a/tests/integrations/huggingface_hub/test_huggingface_hub.py
+++ b/tests/integrations/huggingface_hub/test_huggingface_hub.py
@@ -529,6 +529,7 @@ def test_text_generation(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -665,6 +666,7 @@ def test_text_generation_streaming(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -805,6 +807,7 @@ def test_chat_completion(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -953,6 +956,7 @@ def test_chat_completion_streaming(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -1099,6 +1103,7 @@ def test_chat_completion_api_error(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -1297,6 +1302,7 @@ def test_chat_completion_with_tools(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -1456,6 +1462,7 @@ def test_chat_completion_streaming_with_tools(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
diff --git a/tests/integrations/openai/test_openai.py b/tests/integrations/openai/test_openai.py
index e6dc003ccc..a5408d9267 100644
--- a/tests/integrations/openai/test_openai.py
+++ b/tests/integrations/openai/test_openai.py
@@ -3721,6 +3721,7 @@ def test_ai_client_span_responses_api_no_pii(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "openai tx",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -3913,6 +3914,7 @@ def test_ai_client_span_responses_api(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "openai tx",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -4595,6 +4597,7 @@ async def test_ai_client_span_responses_async_api(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "openai tx",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -5165,6 +5168,7 @@ async def test_ai_client_span_streaming_responses_async_api(
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "openai tx",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
diff --git a/tests/tracing/test_decorator.py b/tests/tracing/test_decorator.py
index 4e0c6cc1a9..bfb652b529 100644
--- a/tests/tracing/test_decorator.py
+++ b/tests/tracing/test_decorator.py
@@ -195,6 +195,7 @@ def my_agent():
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test-transaction",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -217,6 +218,7 @@ def my_agent():
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test-transaction",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -245,6 +247,7 @@ def my_agent():
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test-transaction",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -389,6 +392,7 @@ def my_agent():
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test-transaction",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -412,6 +416,7 @@ def my_agent():
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test-transaction",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
@@ -439,6 +444,7 @@ def my_agent():
             "sentry.sdk.version": mock.ANY,
             "sentry.segment.id": mock.ANY,
             "sentry.segment.name": "test-transaction",
+            "server.address": mock.ANY,
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }