diff --git a/composer.json b/composer.json
index 2293a22..4035caf 100644
--- a/composer.json
+++ b/composer.json
@@ -4,8 +4,8 @@
     "license": "OSL-3.0",
     "require": {
         "php": "^8.1",
-        "tweakwise/magento2-tweakwise": ">=5.7.4",
-        "emico/m2-attributelanding": ">=4.1"
+        "tweakwise/magento2-tweakwise": ">=8.4.0",
+        "emico/m2-attributelanding": ">=5.1.0"
     },
     "require-dev": {
         "symfony/finder": "^6.4.0",
diff --git a/src/Model/FilterApplier/TweakwiseFilterApplier.php b/src/Model/FilterApplier/TweakwiseFilterApplier.php
index 87a4166..6d9de9a 100644
--- a/src/Model/FilterApplier/TweakwiseFilterApplier.php
+++ b/src/Model/FilterApplier/TweakwiseFilterApplier.php
@@ -50,6 +50,11 @@ public function applyFilters(LandingPageInterface $page)
         if ($sortTemplateId) {
             $navigationRequest->setSortTemplateId($sortTemplateId);
         }
+
+        $builderTemplateId = $page->getTweakwiseBuilderTemplate();
+        if ($builderTemplateId) {
+            $navigationRequest->setBuilderTemplateId($builderTemplateId);
+        }
     }
 
     /**
diff --git a/src/view/adminhtml/ui_component/emico_attributelanding_page_form.xml b/src/view/adminhtml/ui_component/emico_attributelanding_page_form.xml
index b8ad876..ceb5be7 100644
--- a/src/view/adminhtml/ui_component/emico_attributelanding_page_form.xml
+++ b/src/view/adminhtml/ui_component/emico_attributelanding_page_form.xml
@@ -119,6 +119,30 @@
 					</settings>
 				</actionDelete>
 			</container>
-		</dynamicRows>
+        </dynamicRows>
+
+        <field formElement="select" name="tweakwise_builder_template" sortOrder="66">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">Page</item>
+                </item>
+            </argument>
+
+            <settings>
+                <dataType>text</dataType>
+                <label translate="true">Tweakwise builder template</label>
+                <dataScope>tweakwise_builder_template</dataScope>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">false</rule>
+                </validation>
+            </settings>
+            <formElements>
+                <select>
+                    <settings>
+                        <options class="Tweakwise\Magento2Tweakwise\Model\Config\Source\BuilderTemplate" />
+                    </settings>
+                </select>
+            </formElements>
+        </field>
 	</fieldset>
 </form>