diff --git a/templates/blocks/block.html.twig b/templates/blocks/block.html.twig
index cf54090cf2c0a8d19a5848b1a0c7620f24cb5faf..eb8af384f503e23d4596157198ce5475a2c6feeb 100644
--- a/templates/blocks/block.html.twig
+++ b/templates/blocks/block.html.twig
@@ -1,46 +1,54 @@
 {#
- /**
-  * @file
-  * Theme override to display a block.
-  *
-  * Available variables:
-  * - plugin_id: The ID of the block implementation.
-  * - label: The configured label of the block if visible.
-  * - configuration: A list of the block's configuration values.
-  *   - label: The configured label for the block.
-  *   - label_display: The display settings for the label.
-  *   - provider: The module or other provider that provided this block plugin.
-  *   - Block plugin specific settings will also be stored here.
-  * - content: The content of this block.
-  * - attributes: array of HTML attributes populated by modules, intended to be added to the main container tag of this template.
-  *   - id: A valid HTML ID and guaranteed unique.
-  * - title_attributes: Same as attributes, except applied to the main title tag that appears in the template.
-  * - title_prefix: Additional output populated by modules, intended to be displayed in front of the main title tag that appears in the template.
-  * - title_suffix: Additional output populated by modules, intended to be displayed after the main title tag that appears in the template.
-  *
-  * @see template_preprocess_block()
-  */
+/**
+ * @file
+ * Theme override to display a block.
+ *
+ * Available variables:
+ * - plugin_id: The ID of the block implementation.
+ * - label: The configured label of the block if visible.
+ * - configuration: A list of the block's configuration values.
+ *   - label: The configured label for the block.
+ *   - label_display: The display settings for the label.
+ *   - provider: The module or other provider that provided this block plugin.
+ *   - Block plugin specific settings will also be stored here.
+ * - content: The content of this block.
+ * - attributes: array of HTML attributes populated by modules, intended to
+ *   be added to the main container tag of this template.
+ *   - id: A valid HTML ID and guaranteed unique.
+ * - title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
+ *
+ * @see template_preprocess_block()
+ */
 #}
+{%
+  set classes = [
+  'block',
+  'block-' ~ configuration.provider|clean_class,
+  'block-' ~ plugin_id|clean_class,
+]
+%}
 
-{% set classes = [
-  'l-block--provider-' ~ configuration.provider|clean_class,
-  'l-block--id-' ~ plugin_id|clean_class,
-] %}
+{% if in_layout_builder %}
+  {{ attach_library('uw_theme_admin/uw_layout_builder') }}
+{% endif %}
 
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@layouts/block/block.twig' with {
-  'attributes': attributes,
-  'block_wrapper': true,
-  'constrain': '',
-  'title_prefix': title_prefix,
-  'title_suffix': title_suffix,
-  'label': label is not empty ? label : false,
-  'content_wrapper': true
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% if content %}
+  <div{{ attributes.addClass(classes) }}>
+    {% if admin_label %}
+      <div class="uw-admin-label">{{ admin_label }}</div>
+    {% endif %}
+    {{ title_prefix }}
+    {% if label %}
+      <h2{{ title_attributes }}>{{ label }}</h2>
+    {% endif %}
+    {{ title_suffix }}
+    {% block content %}
+      {{ content }}
+    {% endblock %}
+  </div>
+{% endif %}