diff --git a/css/block-class.css b/css/block-class.css
index 73dbf24..3c3b9c8 100644
--- a/css/block-class.css
+++ b/css/block-class.css
@@ -6,6 +6,19 @@
   display: none;
 }
 
+.hidden-attribute-field {
+  display: none;
+}
+
+/* Attributes that will be managed dynamically using JS */
 .multiple-textfield-attribute {
   display: none;
 }
+
+#edit-attributes-add-another-attribute {
+  display: none;
+}
+
+#edit-attributes-remove-attribute {
+  display: none;
+}
diff --git a/src/Service/BlockClassHelperService.php b/src/Service/BlockClassHelperService.php
index a155443..fc927c5 100644
--- a/src/Service/BlockClassHelperService.php
+++ b/src/Service/BlockClassHelperService.php
@@ -548,6 +548,20 @@ class BlockClassHelperService {
 
         }
 
+        $form['attributes']['add_another_attribute'] = [
+          '#type' => 'button',
+          '#value' => 'Add another attribute',
+        ];
+
+        $form['attributes']['add_another_attribute']['#attributes']['class'][] = 'block-class-add-another-attribute';
+
+        $form['attributes']['remove_attribute'] = [
+          '#type' => 'button',
+          '#value' => 'Remove attribute',
+        ];
+
+        $form['attributes']['remove_attribute']['#attributes']['class'][] = 'block-class-remove-attribute';
+
         // Get the field type if exists.
         if (!empty($config->get('field_type_attributes'))) {
           $field_type_attributes = $config->get('field_type_attributes');