diff --git a/composer.json b/composer.json
index 13fdb991f1ede338d90e42e95f31ad9bc040fcc3..bc6699f7f236c2a5f376d5d72ad3d8bd2ad266a4 100644
--- a/composer.json
+++ b/composer.json
@@ -126,7 +126,7 @@
     "drupal/better_exposed_filters": "3.0-alpha3",
     "drupal/autocomplete_deluxe": "1.0-beta1",
     "drupal/link_attributes": "1.1",
-    "drupal/paragraphs": "1.x-dev#e907f6d57c44e81d65e8c1e7247dccd0eae92258",
+    "drupal/paragraphs": "1.x-dev#abd9a871f6390a7e6b24985635ecc90db5179e15",
     "drupal/paragraphs_previewer": "1.0",
     "drupal/color_field": "2.0-rc2",
     "drupal/entity_reference_revisions": "1.3",
@@ -266,11 +266,11 @@
       },
       "drupal/paragraphs": {
         "Issue #2461695: Support translatable paragraph entity reference revision field":
-        "https://www.drupal.org/files/issues/meta_support-2461695-206.patch",
+        "https://www.drupal.org/files/issues/meta_support-2461695-222.patch",
         "Issue #2868155: Add new hooks to allow easier editing of paragraph forms":
-        "https://www.drupal.org/files/issues/2868155-8.patch",
+        "https://www.drupal.org/files/issues/2868155-16.patch",
         "Issue #2877927: Show add widget between paragraphs on hover":
-        "https://www.drupal.org/files/issues/show_add_widget-2877927-25.patch"
+        "https://www.drupal.org/files/issues/2877927_29.patch"
       },
       "drupal/adminimal_theme": {
         "Issue #2696393: Checkboxes with .error class are not usable":
diff --git a/drupal-org.make b/drupal-org.make
index 642dfdb3d0d5ac16eaab4ab5840061475d2e3afb..a0690d0c7a7fe040a0fc5fe6e3d41b45b45ebafc 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -254,14 +254,14 @@ projects[link_attributes][version] = 1.1
 
 projects[paragraphs[type] = module
 projects[paragraphs][download][url] = https://git.drupal.org/project/paragraphs.git
-projects[paragraphs][download][revision] = e907f6d57c44e81d65e8c1e7247dccd0eae92258
+projects[paragraphs][download][revision] = abd9a871f6390a7e6b24985635ecc90db5179e15
 projects[paragraphs][download][branch] = 8.x-1.x
 ;; Issue #2461695: Support translatable paragraph entity reference revision field
-projects[paragraphs][patch][] = https://www.drupal.org/files/issues/meta_support-2461695-206.patch
+projects[paragraphs][patch][] = https://www.drupal.org/files/issues/meta_support-2461695-222.patch
 ;; Issue #2868155: Add new hooks to allow easier editing of paragraph forms
-projects[paragraphs][patch][] = https://www.drupal.org/files/issues/2868155-8.patch
+projects[paragraphs][patch][] = https://www.drupal.org/files/issues/2868155-16.patch
 ;; Issue #2877927: Show add widget between paragraphs on hover
-projects[paragraphs][patch][] = https://www.drupal.org/files/issues/show_add_widget-2877927-25.patch
+projects[paragraphs][patch][] = https://www.drupal.org/files/issues/2877927_29.patch
 
 projects[color_field][type] = module
 projects[color_field][version] = 2.0-rc2
diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
index f8e4e82e435f189fe81ae1af2e3f31c1fe8ad827..576d8e4b91076e5d24d6ace96e0f9461a63bd2ac 100644
--- a/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-03-landing-page_add-any-paragraph-type-to-the-page.feature
@@ -41,12 +41,12 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Carousel" for "Title"
       And I fill in "Test Landing page description Carousel" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Carousel"
       And I wait for AJAX to finish
       And I select "2 Seconds" from "Slide interval"
-      And I expand the "1" select list "dropbutton-multiple"
+      And I expand the "0" select list "dropbutton-multiple"
       And I wait
       And I press "Add Image"
       And I wait for AJAX to finish
@@ -62,7 +62,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I switch to main frame
       And I wait for AJAX to finish
       And I wait
-      And I expand the "1" select list "dropbutton-multiple"
+      And I expand the "0" select list "dropbutton-multiple"
       And I wait for AJAX to finish
       And I press "Add Image"
       And I wait for AJAX to finish
@@ -92,7 +92,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Accordion" for "Title"
       And I fill in "Test Landing page description Accordion" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait
       And I press "Accordion"
       And I wait for AJAX to finish
@@ -112,7 +112,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait for AJAX to finish
       And I wait
       And I fill in "Accordion Section Title test" for "Accordion section title"
-     When I expand the "1" select list "dropbutton-multiple"
+     When I expand the "0" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait
      Then I should see "Accordion section body"
@@ -131,7 +131,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Drupal Block" for "Title"
       And I fill in "Test Landing page description Drupal Block" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Drupal Block"
       And I wait for AJAX to finish
@@ -150,7 +150,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Columns (Equal)" for "Title"
       And I fill in "Test Landing page description Columns (Equal)" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Columns (Equal)"
       And I wait for AJAX to finish
@@ -179,7 +179,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Columns (Two Uneven)" for "Title"
       And I fill in "Test Landing page description Columns (Two Uneven)" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Columns (Two Uneven)"
       And I wait for AJAX to finish
@@ -207,7 +207,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Columns (Three Uneven)" for "Title"
       And I fill in "Test Landing page description Columns (Two Uneven)" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Columns (Three Uneven)"
       And I wait for AJAX to finish
@@ -223,7 +223,7 @@ So that the "Landing page" will show up having paragrpahs of different types
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
       And I wait
-      And I expand the "1" select list "dropbutton-multiple"
+      And I expand the "0" select list "dropbutton-multiple"
       And I press "Add Image"
       And I wait for AJAX to finish
       And I press the "Select an image" button
@@ -249,7 +249,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Image" for "Title"
       And I fill in "Test Landing page description Image" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Image"
       And I wait for AJAX to finish
@@ -277,14 +277,14 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Modal" for "Title"
       And I fill in "Test Landing page description Modal" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Modal"
       And I wait for AJAX to finish
      Then I should see "Components"
      When I fill in "Modal button" for "Modal button text"
       And I fill in "Modal title" for "Modal title"
-      And I expand the "1" select list "dropbutton-multiple"
+      And I expand the "0" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait
      Then I should see "Modal body"
@@ -303,7 +303,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I wait
       And I fill in "Test Landing page Rich Text" for "Title"
       And I fill in "Test Landing page description Rich Text" for "Page description"
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Rich Text"
       And I wait for AJAX to finish
@@ -335,7 +335,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page Tabs" for "Title"
       And I fill in "Test Landing page description Tabs" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Tabs"
       And I wait for AJAX to finish
@@ -352,7 +352,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I switch to main frame
       And I should see "Components"
       And I fill in "Tab 1" for "Tab name"
-      And I expand the "1" select list "dropbutton-multiple"
+      And I expand the "0" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait
      Then I should see "Tab body"
@@ -371,7 +371,7 @@ So that the "Landing page" will show up having paragrpahs of different types
       And I fill in "Test Landing page WebForm" for "Title"
       And I fill in "Test Landing page description WebForm" for "Page description"
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I press "Webform"
       And I wait for AJAX to finish
diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
index 4ee2e3ee2621b93e7fdd8303ab680bd2733b10aa..327342bf52c1ac9e242300fb265e2195fcf7c0f9 100644
--- a/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
+++ b/tests/features/varbase/step2-apply-tests/04-content-structure/04-04-landing-page_text-and-image-paragraphs.feature
@@ -42,7 +42,7 @@ So that the "Landing page" will have text and images in right and left view.
       And I fill in "Test landing page body description." for "Page description"
 
   # Add Rich text centered
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait
       And I scrolldown
       And I press "Rich Text"
@@ -58,7 +58,7 @@ So that the "Landing page" will have text and images in right and left view.
      When I click "Edit"
       And I wait
       And I scrolldown
-      And I press the "2" "+   Add Component" button
+      And I press "Add Component"
       And I wait
       And I press "Text and image"
       And I wait for AJAX to finish
@@ -88,7 +88,7 @@ So that the "Landing page" will have text and images in right and left view.
      When I click "Edit"
       And I wait
       And I scrolldown
-      And I press the "3" "+   Add Component" button
+      And I press "Add Component"
       And I wait
       And I press "Text and image"
       And I wait for AJAX to finish
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
index 398daa2afbba6b0a42606bf6226e1c43e822033b..a7ee3139289d3ba2b05aafc7c9b4b7930e2265cc 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-03-add-hero-slider-to-entityqueue-using-entityqueue-form-widget.feature
@@ -44,7 +44,7 @@ I want to be able to add and remove entities to any allowed entityqueue.
       And I switch to iframe "entity_browser_iframe_heroslider_media_browser"
       And I fill in "Embed Flag Earth" for "Search"
       And I press the "Search" button
-      And I wait for AJAX to finish
+      And wait max of 5s
      Then I should see image with the "Embed Flag Earth all earth in space" title text
      When I double click on the image with the "Embed Flag Earth all earth in space" title text
       And I switch to main frame
diff --git a/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature b/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
index a9f857b24814c4e7bcf4381e3e72fa85a1266894..2a2eb71242239087d8723c608a6e8696004c1b78 100644
--- a/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
+++ b/tests/features/varbase/step2-apply-tests/05-content-management/05-04-cloning-content-and-entities.feature
@@ -12,7 +12,7 @@ I want to be able to clone an entity.
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
-      And I press "+   Add Component"
+      And I press "Add Component"
       And I wait for AJAX to finish
       And I scrolldown
       And I wait for AJAX to finish
@@ -21,7 +21,7 @@ I want to be able to clone an entity.
      Then I should see "Components"
      When I fill in "Modal button" for "Modal button text"
       And I fill in "Modal title" for "Modal title"
-      And I expand the "1" select list "dropbutton-multiple"
+      And I expand the "0" select list "dropbutton-multiple"
       And I press "Add Rich Text"
       And I wait
      Then I should see "Modal body"
@@ -65,6 +65,6 @@ I want to be able to clone an entity.
       And I wait
      Then I should see "Modal button"
      When I press "Modal button"
-      And I wait
+      And I wait for AJAX to finish
      Then I should see "Modal title"
       And I should see "Modal Body test"