diff --git a/App/FeatureSet/Home/Static/img/apm-1.png b/App/FeatureSet/Home/Static/img/apm-1.png
new file mode 100644
index 00000000000..83f5dfdae8e
Binary files /dev/null and b/App/FeatureSet/Home/Static/img/apm-1.png differ
diff --git a/App/FeatureSet/Home/Static/img/apm-2.png b/App/FeatureSet/Home/Static/img/apm-2.png
new file mode 100644
index 00000000000..69703dd08b9
Binary files /dev/null and b/App/FeatureSet/Home/Static/img/apm-2.png differ
diff --git a/App/FeatureSet/Home/Static/img/apm-3.png b/App/FeatureSet/Home/Static/img/apm-3.png
new file mode 100644
index 00000000000..f898bd5a9d8
Binary files /dev/null and b/App/FeatureSet/Home/Static/img/apm-3.png differ
diff --git a/App/FeatureSet/Home/views/partials/product-tabs.ejs b/App/FeatureSet/Home/views/partials/product-tabs.ejs
index 5bbc29a01a9..9dc669522b2 100644
--- a/App/FeatureSet/Home/views/partials/product-tabs.ejs
+++ b/App/FeatureSet/Home/views/partials/product-tabs.ejs
@@ -1,6 +1,6 @@
 <div class="relative overflow-hidden bg-white pt-32 pb-32">
     <div class="max-w-3xl1 px-6">
-        <p class="text-5xl font-bold tracking-tight text-gray-900 sm:text-center">OneUptime is 6+ tools combined
+        <p class="text-5xl font-bold tracking-tight text-gray-900 sm:text-center">OneUptime is 7+ tools combined
             into one.</p>
         <p class="mt-5 text-xl text-gray-500 sm:text-center mb-12">Everything from monitoring, status pages,
             incident management, on-call schedules - we've got it and we are just getting started!</p>
@@ -14,8 +14,9 @@
                 <option value="2">Monitoring</option>
                 <option value="3">Incidents</option>
                 <option value="4">On Call</option>
-                <option value="5">Logs Management</option>
-                <option value="6">Workflows </option>
+                <option value="5">Logs</option>
+                <option value="6">APM</option>
+                <option value="7">Workflows </option>
             </select>
           </div>
 
@@ -76,13 +77,25 @@
                             <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 12h16.5m-16.5 3.75h16.5M3.75 19.5h16.5M5.625 4.5h12.75a1.875 1.875 0 0 1 0 3.75H5.625a1.875 1.875 0 0 1 0-3.75Z" />
                           </svg>
 
-                        <span>Logs Management</span>
+                        <span>Logs</span>
                     </a>
 
                     <a onclick="showTab(6)"
                         class="tab-6-button cursor-pointer  border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 group inline-flex items-center border-b-2 py-4 px-1 font-medium">
                     
                         <svg class="icon-tab-6 text-gray-400 group-hover:text-gray-500 -ml-0.5 mr-2 h-5 w-5"
+                            xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-6 h-6">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M3 13.125C3 12.504 3.504 12 4.125 12h2.25c.621 0 1.125.504 1.125 1.125v6.75C7.5 20.496 6.996 21 6.375 21h-2.25A1.125 1.125 0 0 1 3 19.875v-6.75ZM9.75 8.625c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125v11.25c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V8.625ZM16.5 4.125c0-.621.504-1.125 1.125-1.125h2.25C20.496 3 21 3.504 21 4.125v15.75c0 .621-.504 1.125-1.125 1.125h-2.25a1.125 1.125 0 0 1-1.125-1.125V4.125Z" />
+                        </svg>
+
+                        <span>APM</span>
+                    </a>
+
+                    <a onclick="showTab(7)"
+                        class="tab-7-button cursor-pointer  border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 group inline-flex items-center border-b-2 py-4 px-1 font-medium">
+                    
+                        <svg class="icon-tab-7 text-gray-400 group-hover:text-gray-500 -ml-0.5 mr-2 h-5 w-5"
                             xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
                             stroke="currentColor" class="w-6 h-6">
                             <path strokeLinecap="round" strokeLinejoin="round"
@@ -442,6 +455,73 @@
         <div class="lg:mx-auto lg:grid lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3 lg:gap-24 lg:px-8">
 
 
+            <div class="mx-auto max-w-xl px-6 lg:mx-0 lg:max-w-none py-16 lg:px-0">
+                <div>
+                    <div class="mt-6">
+                        <h2 class="text-2xl font-medium tracking-tight text-gray-900">Monitor performance of any app, any service, any stack.</h2>
+
+                        <ul role="list" class="mt-6 space-y-3 mt-8 mb-8 text-lg text-gray-500">
+                            <li class="flex space-x-3">
+                                <%- include('./tick-icon') %>
+                                    <div class="text-gray-500 -mt-1">Monitor any Backend </div>
+                            </li>
+                            <li class="flex space-x-3">
+                                <%- include('./tick-icon') %>
+                                    <div class="text-gray-500 -mt-1">Monitor any Database </div>
+                            </li>
+                            <li class="flex space-x-3">
+                                <%- include('./tick-icon') %>
+                                    <div class="text-gray-500 -mt-1">Monitor any Frontend</div>
+                            </li>
+                            <li class="flex space-x-3">
+                                <%- include('./tick-icon') %>
+                                    <div class="text-gray-500 -mt-1">Monitor Microservices</div>
+                            </li>
+                        </ul>
+
+
+                        <div class="mt-6">
+                            <a href="/accounts/register"
+                                class="rounded-md bg-indigo-600 px-3.5 py-1.5 text-base font-semibold leading-7 text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 hover:text-white">Get
+                                started</a>
+                            <a href="/product/workflows"
+                                class="text-base font-semibold leading-7 text-gray-900 ml-3">Learn more <span
+                                    aria-hidden="true">→</span></a>
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-8 border-t border-gray-200 pt-6">
+                    <blockquote>
+                        <div>
+                            <p class="text-base text-gray-500">&ldquo;Workflows are very powerful feature of OneUptime.
+                                Let's us automate literally anything.&rdquo;</p>
+                        </div>
+                        <footer class="mt-3">
+                            <div class="flex items-center space-x-3">
+                                <div class="text-base font-medium text-gray-700">Jamie Polowin, AlternativeTo Reviewer
+                                </div>
+                            </div>
+                        </footer>
+                    </blockquote>
+                </div>
+            </div>
+
+            <div class="my-auto mx-auto px-6 col-span-2">
+                <div
+                    class="relative -m-2 rounded-xl bg-gray-900/5 p-2 ring-1 ring-inset ring-gray-900/10 lg:-m-4 lg:rounded-2xl lg:p-4">
+
+                    <img class="relative rounded-lg shadow-lg" src="/img/apm-2.png" alt="App screenshot">
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="mt-10 tab-7" style="display: none;">
+        <div class="lg:mx-auto lg:grid lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3 lg:gap-24 lg:px-8">
+
+
             <div class="mx-auto max-w-xl px-6 lg:mx-0 lg:max-w-none py-16 lg:px-0">
                 <div>
                     <div class="mt-6">