diff --git a/inc/fieldGroups/pageComponents.php b/inc/fieldGroups/pageComponents.php
index 1f11ec862..08154c679 100644
--- a/inc/fieldGroups/pageComponents.php
+++ b/inc/fieldGroups/pageComponents.php
@@ -31,13 +31,8 @@
             [
                 [
                     'param' => 'post_type',
-                    'operator' => '==',
-                    'value' => 'page'
-                ],
-                [
-                    'param' => 'page_type',
                     'operator' => '!=',
-                    'value' => 'posts_page'
+                    'value' => 'post'
                 ]
             ]
         ]
diff --git a/index.php b/index.php
index f7d60d2cf..0959a8ff0 100644
--- a/index.php
+++ b/index.php
@@ -1,12 +1,14 @@
 <?php
 
 use Timber\Timber;
+use Timber\Post;
 use Timber\PostQuery;
 use Flynt\Utils\Options;
 
 use const Flynt\Archives\POST_TYPES;
 
 $context = Timber::get_context();
+$context['post'] = new Post();
 $context['posts'] = new PostQuery();
 
 if (isset($_GET['contentOnly'])) {
diff --git a/templates/index.twig b/templates/index.twig
index c7fe56714..6222d23c8 100644
--- a/templates/index.twig
+++ b/templates/index.twig
@@ -2,4 +2,7 @@
 
 {% block content %}
   {{ renderComponent('GridPostsArchive', { posts: posts }) }}
+  {% for component in post.meta('pageComponents') %}
+    {{ renderComponent(component) }}
+  {% endfor %}
 {% endblock %}