diff --git a/src/Turbo/templates/components/Stream.html.twig b/src/Turbo/templates/components/Stream.html.twig
new file mode 100644
index 00000000000..69805a8edb1
--- /dev/null
+++ b/src/Turbo/templates/components/Stream.html.twig
@@ -0,0 +1,3 @@
+{% props action -%}
+
+<turbo-stream action="{{ action }}" {{- attributes }}></turbo-stream>
diff --git a/src/Turbo/templates/components/Stream/After.html.twig b/src/Turbo/templates/components/Stream/After.html.twig
deleted file mode 100644
index 3105a376dec..00000000000
--- a/src/Turbo/templates/components/Stream/After.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% props target -%}
-
-<turbo-stream action="after" targets="{{ target }}" {{ attributes }}>
-    <template>{% block content %}{% endblock %}</template>
-</turbo-stream>
diff --git a/src/Turbo/templates/components/Stream/Append.html.twig b/src/Turbo/templates/components/Stream/Append.html.twig
deleted file mode 100644
index aea22f28227..00000000000
--- a/src/Turbo/templates/components/Stream/Append.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% props target -%}
-
-<turbo-stream action="append" targets="{{ target }}" {{ attributes }}>
-    <template>{% block content %}{% endblock %}</template>
-</turbo-stream>
diff --git a/src/Turbo/templates/components/Stream/Before.html.twig b/src/Turbo/templates/components/Stream/Before.html.twig
index 3ffdeded6aa..2a1506294cd 100644
--- a/src/Turbo/templates/components/Stream/Before.html.twig
+++ b/src/Turbo/templates/components/Stream/Before.html.twig
@@ -1,5 +1,5 @@
 {% props target -%}
 
-<turbo-stream action="before" targets="{{ target }}" {{ attributes }}>
+<turbo-stream action="before" targets="{{ target }}" {{- attributes }}>
     <template>{% block content %}{% endblock %}</template>
 </turbo-stream>
diff --git a/src/Turbo/templates/components/Stream/Prepend.html.twig b/src/Turbo/templates/components/Stream/Prepend.html.twig
index b75d3534ef9..5b0d92b35c2 100644
--- a/src/Turbo/templates/components/Stream/Prepend.html.twig
+++ b/src/Turbo/templates/components/Stream/Prepend.html.twig
@@ -1,5 +1,5 @@
 {% props target -%}
 
-<turbo-stream action="prepend" targets="{{ target }}" {{ attributes }}>
+<turbo-stream action="prepend" targets="{{ target }}" {{- attributes }}>
     <template>{% block content %}{% endblock %}</template>
 </turbo-stream>
diff --git a/src/Turbo/templates/components/Stream/Refresh.html.twig b/src/Turbo/templates/components/Stream/Refresh.html.twig
index 182129e6533..11ed9270e23 100644
--- a/src/Turbo/templates/components/Stream/Refresh.html.twig
+++ b/src/Turbo/templates/components/Stream/Refresh.html.twig
@@ -1,3 +1,3 @@
 {% props requestId = null -%}
 
-<turbo-stream action="refresh"{% if requestId is not null %} request-id="{{ requestId }}"{% endif %} {{ attributes }}></turbo-stream>
+<turbo-stream action="refresh"{% if requestId is not null %} request-id="{{ requestId }}"{% endif %} {{- attributes }}></turbo-stream>
diff --git a/src/Turbo/templates/components/Stream/Remove.html.twig b/src/Turbo/templates/components/Stream/Remove.html.twig
index 9e3c023480d..aa5e24e46c0 100644
--- a/src/Turbo/templates/components/Stream/Remove.html.twig
+++ b/src/Turbo/templates/components/Stream/Remove.html.twig
@@ -1,3 +1,3 @@
 {% props target -%}
 
-<turbo-stream action="remove" targets="{{ target }}" {{ attributes }}></turbo-stream>
+<turbo-stream action="remove" targets="{{ target }}" {{- attributes }}></turbo-stream>
diff --git a/src/Turbo/templates/components/Stream/Replace.html.twig b/src/Turbo/templates/components/Stream/Replace.html.twig
index d11598f6885..5f9b4557083 100644
--- a/src/Turbo/templates/components/Stream/Replace.html.twig
+++ b/src/Turbo/templates/components/Stream/Replace.html.twig
@@ -1,5 +1,5 @@
 {% props target, morph = false -%}
 
-<turbo-stream action="replace" targets="{{ target }}"{% if morph %} method="morph"{% endif %} {{ attributes }}>
+<turbo-stream action="replace" targets="{{ target }}"{% if morph %} method="morph"{% endif %} {{- attributes }}>
     <template>{% block content %}{% endblock %}</template>
 </turbo-stream>
diff --git a/src/Turbo/templates/components/Stream/Update.html.twig b/src/Turbo/templates/components/Stream/Update.html.twig
index f15fbfc0094..23c521506a0 100644
--- a/src/Turbo/templates/components/Stream/Update.html.twig
+++ b/src/Turbo/templates/components/Stream/Update.html.twig
@@ -1,5 +1,5 @@
 {% props target, morph = false -%}
 
-<turbo-stream action="update" targets="{{ target }}"{% if morph %} method="morph"{% endif %} {{ attributes }}>
+<turbo-stream action="update" targets="{{ target }}"{% if morph %} method="morph"{% endif %} {{- attributes }}>
     <template>{% block content %}{% endblock %}</template>
 </turbo-stream>