diff --git a/bpf/http2_grpc.h b/bpf/http2_grpc.h
index 797682a40..2fe862ef1 100644
--- a/bpf/http2_grpc.h
+++ b/bpf/http2_grpc.h
@@ -89,4 +89,8 @@ static __always_inline u8 is_data_frame(frame_header_t *frame) {
     return frame->length && frame->type == FrameData;
 }
 
+static __always_inline u8 is_flags_only_frame(frame_header_t *frame) {
+    return frame->length <= 2;
+}
+
 #endif // HTTP2_GRPC_HELPERS
\ No newline at end of file
diff --git a/bpf/http_sock.h b/bpf/http_sock.h
index 41005b5de..02a22ff87 100644
--- a/bpf/http_sock.h
+++ b/bpf/http_sock.h
@@ -441,7 +441,8 @@ static __always_inline void http2_grpc_start(http2_conn_stream_t *s_key, void *u
         return;
     }
     http2_grpc_request_t *h2g_info = empty_http2_info();
-    bpf_dbg_printk("http2/grpc start direction=%d", direction);
+    bpf_dbg_printk("http2/grpc start direction=%d stream=%d", direction, s_key->stream_id);
+    //dbg_print_http_connection_info(&s_key->pid_conn.conn); // commented out since GitHub CI doesn't like this call
     if (h2g_info) {
         http_connection_metadata_t *meta = connection_meta_by_direction(&s_key->pid_conn, direction, PACKET_TYPE_REQUEST);
         if (!meta) {
@@ -469,6 +470,8 @@ static __always_inline void http2_grpc_end(http2_conn_stream_t *stream, http2_gr
     bpf_dbg_printk("http2/grpc end prev_info=%llx", prev_info);
     if (prev_info) {
         prev_info->end_monotime_ns = bpf_ktime_get_ns();
+        bpf_dbg_printk("stream_id = %d", stream->stream_id);
+        //dbg_print_http_connection_info(&stream->pid_conn.conn); // commented out since GitHub CI doesn't like this call
 
         http2_grpc_request_t *trace = bpf_ringbuf_reserve(&events, sizeof(http2_grpc_request_t), 0);        
         if (trace) {
@@ -520,8 +523,11 @@ static __always_inline void process_http2_grpc_frames(pid_connection_info_t *pid
                     break;
                 } 
             } else {
-                found_start_frame = 1;
-                break;
+                // Not starting new grpc request, found end frame in a start, likely just terminating prev connection
+                if (!(is_flags_only_frame(&frame) && http_grpc_stream_ended(&frame))) {
+                    found_start_frame = 1;
+                    break;
+                }
             }
         }
 
@@ -546,7 +552,7 @@ static __always_inline void process_http2_grpc_frames(pid_connection_info_t *pid
     }
 
     if (found_start_frame) {
-        http2_grpc_start(&stream, (void *)((u8 *)u_buf + pos), bytes_len, direction, ssl, orig_dport);
+        http2_grpc_start(&stream, (void *)((u8 *)u_buf + pos), bytes_len, direction, ssl, orig_dport);        
     } else {
         // We only loop 6 times looking for the stream termination. If the data packed is large we'll miss the
         // frame saying the stream closed. In that case we try this backup path.
@@ -567,6 +573,7 @@ static __always_inline void process_http2_grpc_frames(pid_connection_info_t *pid
                     bpf_map_delete_elem(&active_ssl_connections, pid_conn);
                 } else {
                     bpf_dbg_printk("grpc request/response mismatch, req_type %d, prev_info->type %d", req_type, prev_info->type);
+                    bpf_map_delete_elem(&ongoing_http2_grpc, &stream);
                 }
             }
         }
diff --git a/pkg/internal/ebpf/httpfltr/bpf_bpfel_arm64.o b/pkg/internal/ebpf/httpfltr/bpf_bpfel_arm64.o
index 664a9ae9c..242b03fbe 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/httpfltr/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_bpfel_x86.o b/pkg/internal/ebpf/httpfltr/bpf_bpfel_x86.o
index 8b784ad51..7b2cd6efe 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_bpfel_x86.o and b/pkg/internal/ebpf/httpfltr/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_arm64.o
index 4d9fc9c90..d4c2ae304 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_x86.o
index 2a416db18..d3f32a558 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/httpfltr/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_arm64.o
index e8ce6a412..177521575 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_arm64.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_x86.o
index bf972f82b..558d14da6 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_x86.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_arm64.o
index c524d02b8..377e45781 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_arm64.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_x86.o
index a4b094c5c..27eae4f70 100644
Binary files a/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_x86.o and b/pkg/internal/ebpf/httpfltr/bpf_tp_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_bpfel_arm64.o b/pkg/internal/ebpf/httpssl/bpf_bpfel_arm64.o
index 0efb51297..2916a9705 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/httpssl/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_bpfel_x86.o b/pkg/internal/ebpf/httpssl/bpf_bpfel_x86.o
index 75c55c7f7..5faf6f0ac 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_bpfel_x86.o and b/pkg/internal/ebpf/httpssl/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_arm64.o
index d492ec483..1be987f8a 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_x86.o
index 5ff30fb9b..12ac34025 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/httpssl/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_arm64.o
index 14f6a4846..8f6488a72 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_arm64.o and b/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_x86.o
index e9fdc9134..917d7a59b 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_x86.o and b/pkg/internal/ebpf/httpssl/bpf_tp_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_arm64.o
index 1910bf852..82c754e7f 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_arm64.o and b/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_x86.o
index b37f67890..8456a203b 100644
Binary files a/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_x86.o and b/pkg/internal/ebpf/httpssl/bpf_tp_debug_bpfel_x86.o differ
diff --git a/pkg/internal/export/otel/metrics.go b/pkg/internal/export/otel/metrics.go
index a4cbf1405..4e2966a80 100644
--- a/pkg/internal/export/otel/metrics.go
+++ b/pkg/internal/export/otel/metrics.go
@@ -668,7 +668,6 @@ func (mr *MetricsReporter) serviceGraphAttributes(span *request.Span) attribute.
 			request.ClientNamespaceMetric(span.ServiceID.Namespace),
 			request.ServerMetric(request.SpanHost(span)),
 			request.ServerNamespaceMetric(span.OtherNamespace),
-			request.ConnectionTypeMetric("virtual_node"),
 			request.SourceMetric("beyla"),
 		}
 	} else {
@@ -677,7 +676,6 @@ func (mr *MetricsReporter) serviceGraphAttributes(span *request.Span) attribute.
 			request.ClientNamespaceMetric(span.OtherNamespace),
 			request.ServerMetric(request.SpanHost(span)),
 			request.ServerNamespaceMetric(span.ServiceID.Namespace),
-			request.ConnectionTypeMetric("virtual_node"),
 			request.SourceMetric("beyla"),
 		}
 	}
diff --git a/test/integration/k8s/common/k8s_metrics_testfuncs.go b/test/integration/k8s/common/k8s_metrics_testfuncs.go
index 3f26cae35..9967bf1a3 100644
--- a/test/integration/k8s/common/k8s_metrics_testfuncs.go
+++ b/test/integration/k8s/common/k8s_metrics_testfuncs.go
@@ -122,7 +122,7 @@ func FeatureHTTPMetricsDecoration(manifest string) features.Feature {
 				"k8s_replicaset_name": "^testserver-",
 			})).
 		Assess("all the span graph metrics exist",
-			testMetricsDecoration(spanGraphMetrics, `{connection_type="virtual_node",server="testserver"}`, map[string]string{
+			testMetricsDecoration(spanGraphMetrics, `{server="testserver"}`, map[string]string{
 				"server_service_namespace": "integration-test",
 				"source":                   "beyla",
 			}),