diff --git a/src/_data/pricingFeatures.yaml b/src/_data/pricingFeatures.yaml
index 84e49643b6..3be730f634 100644
--- a/src/_data/pricingFeatures.yaml
+++ b/src/_data/pricingFeatures.yaml
@@ -3,18 +3,18 @@ sections:
     rows:
       - id: cloud-devices
         label: Edge Devices
-        cloudValues: [ 'check', 'check', 'check', 'check' ]      
+        cloudValues: [ 'check', 'check', 'check' ]      
         tags: [ 'cloud' ]
         info: "<ul class='py-4'><li><span class='font-semibold'>Starter:</span> Includes 5 edge devices.</li><li><span class='font-semibold'>Team:</span> Starts with 5, shared with hosted instance count.</li><li><span class='font-semibold'>Enterprise:</span> Starts with 20, shared with hosted instance count.</li></ul>"
       - id: nr-hosting
         label: Node-RED Hosting
-        cloudValues: [ null, 'check', 'check', 'check' ]
+        cloudValues: [ 'check', 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>FlowFuse hosts Node-RED instances.</p>"
       - id: cloud-instances
         label: Hosted Instances
-        cloudValues: [ null, 'check', 'check', 'check' ] 
+        cloudValues: [ 'check', 'check', 'check' ] 
         tags: [ 'cloud' ]
         info: "<ul class='py-4'><li><span class='font-semibold'>Starter:</span> Starts with 2 hosted instances, 2 remote instances. Upgrades available up to 3 hosted/3 remote instances.</li><li><span class='font-semibold'>Team:</span> Starts with 5, shared with edge device count.</li><li><span class='font-semibold'>Enterprise:</span> Starts with 20, shared with edge device count.</li></ul>"
       - id: self-hosted-instances
@@ -44,31 +44,31 @@ sections:
         info:
       - id: custom-hostname
         label: Custom Hostnames
-        cloudValues: [ null, null, null, 'check' ]
+        cloudValues: [ null, null, 'check' ]
         selfHostedValues: [ null, 'check' ]    
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Access your Node-RED application via your own domain name.</p>"
       - id: persistent-files
         label: Persistent files
-        cloudValues: [ null, '1 GB', '10 GB', '100 GB' ]    
+        cloudValues: [ '1 GB', '10 GB', '100 GB' ]    
         tags: [ 'cloud' ]
         info: "<p>FlowFuse allows Node-RED instances to store files persistently to local file system. This is the space limit for these files.</p>"
       - id: persistent-context
         label: Persistent Context
-        cloudValues: [ null, '10 MB', '100 MB', '1 GB' ]    
+        cloudValues: [ '10 MB', '100 MB', '1 GB' ]    
         tags: [ 'cloud' ]
         info: "<p>In-memory values defined in a Node-RED flow will persist across project restarts and upgrades.</p>"
   - label: Scale
     rows:
       - id: device-mgmt
         label: Device Management
-        cloudValues: [ 'check', 'check', 'check', 'check' ]
+        cloudValues: [ 'check', 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]    
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Connect to edge devices to quickly assess and update logic. Debug one device and roll out improvements to your fleet in minutes. All securely without requiring full device access for your whole organization.</p>"
       - id: mqtt-broker-cloud
         label: MQTT Broker
-        cloudValues: [ null, 'check', 'check', 'check' ]    
+        cloudValues: [ 'check', 'check', 'check' ]    
         tags: [ 'cloud' ]
         info: "<p>Easily manage and create MQTT clients to transport data for efficient messaging and communication within your applications. The Starter Tier includes 2 clients, the Team Tier includes 5 clients, and the Enterprise Tier includes 20 clients as part of your existing plan. Additional clients can be purchased as needed in the future.</p>"
       - id: mqtt-broker-sh
@@ -78,43 +78,43 @@ sections:
         info: "<p>Easily manage and create MQTT clients to transport data efficiently within your applications. The Team Tier includes 8 clients for free as part of your existing plan, and the Enterprise Tier includes 20. You can purchase additional clients as needed in the future.</p>"
       - id: volume-pricing
         label: Volume Pricing
-        cloudValues: [ null, null, 'check', 'check' ]
+        cloudValues: [ null, 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Scaling to hundreds or thousands of Node-RED instances? <a href='/contact-us'>Contact us</a> for customized volume discounts!</p>"
       - id: edge-development
         label: Edge Development
-        cloudValues: [ null, null, 'check', 'check' ]
+        cloudValues: [ null, 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]    
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Connect to an edge device and develop your flows.</p>"
       - id: pipelines
         label: DevOps Pipelines
-        cloudValues: [ null, null, 'check', 'check' ]
+        cloudValues: [ null, 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>DevOps pipelines allows for you to setup different environments for development, testing and production Node-RED instances.</p>"
       - id: project-nodes
         label: Seamless Data Stream
-        cloudValues: [ null, null, 'check', 'check' ]
+        cloudValues: [ null, 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p><a href='https://github.com/FlowFuse/nr-project-nodes' target='blank'>FlowFuse Project Nodes</a> enable the passing of data and messages between your Node-RED projects, included with all FlowFuse Projects by default.</p>"
       - id: device-groups
         label: Device Group Management
-        cloudValues: [ null, null, null, 'check' ]
+        cloudValues: [ null, null, 'check' ]
         selfHostedValues: [ null, 'check' ]    
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Device Groups enables users to logically group their devices assigned to an application. Additionally, Device Groups can be integrated into the DevOps Pipeline.</p>"    
       - id: git-integration
         label: Git Integration
-        cloudValues: [ null, null, null, 'check' ]
+        cloudValues: [ null, null, 'check' ]
         selfHostedValues: [ null, 'check' ]    
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Backup your flows to a remote git repository through a DevOps Pipeline.</p>"
       - id: ha
         label: High Availability
-        cloudValues: [ null, null, null, 'check' ]
+        cloudValues: [ null, null, 'check' ]
         selfHostedValues: [ null, 'check' ]    
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Leverage horizontal scaling for reliable and scalible processing of your data through Node-RED.</p>"      
@@ -122,49 +122,49 @@ sections:
     rows:
       - id: audit-log
         label: Audit Log
-        cloudValues: [ 'check', 'check', 'check', 'check' ]
+        cloudValues: [ 'check', 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Keep track of everything going on in your Node-RED instances and FlowFuse.</p><p>Audit Logs provide details on what actions have taken place, when they happened, and who did them.</p>"
       - id: rbac
         label: Role-Based Access Control
-        cloudValues: [ null, 'check', 'check', 'check' ]
+        cloudValues: [ 'check', 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>FlowFuse's intuitive team management tooling makes it easy for you to control whom has access to what.</p>"
       - id: security
         label: Endpoint Security
-        cloudValues: [ null, 'None<br>HTTP Basic Auth', 'None<br>HTTP Basic Auth<br>FlowFuse Authentication', 'None<br>HTTP Basic Auth<br>FlowFuse Authentication' ]
+        cloudValues: [ 'None<br>HTTP Basic Auth', 'None<br>HTTP Basic Auth<br>FlowFuse Authentication', 'None<br>HTTP Basic Auth<br>FlowFuse Authentication' ]
         selfHostedValues: [ 'None<br>HTTP Basic Auth', 'None<br>HTTP Basic Auth<br>FlowFuse Authentication' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Use FlowFuse credentials to secure HTTP endpoints for hosted instances.</p>"
       - id: 2fa
         label: Two-factor authentication
-        cloudValues: [ 'check', 'check', 'check', 'check' ]
+        cloudValues: [ 'check', 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p><a href='https://flowfuse.com/docs/user/user-settings/#two-factor-authentication' target='blank'>Two-factor authentication</a> adds an extra layer of security to your account.</p>"
       - id: certified-nodes
         label: Certified Nodes
-        cloudValues: [ null, null, 'check', 'check' ]
+        cloudValues: [ null, 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>FlowFuse Certified Nodes a selection of certfied Node-RED nodes, enhancing efficiency and security.</p>"
       - id: instance-monitoring
         label: Instance Monitoring
-        cloudValues: [ null, null, 'check', 'check' ]
+        cloudValues: [ null, 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>You can enable alerts to be sent to you via email. <a href='https://flowfuse.com/docs/user/instance-settings/#alerts' target='blank'>Learn more</a></p>"
       - id: sso
         label: Single Sign-On (SSO)
-        cloudValues: [ null, null, null, 'check' ]
+        cloudValues: [ null, null, 'check' ]
         selfHostedValues: [ null, 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>FlowFuse can be configured to run with your own Single Sign-On (SSO) provider. Allow users to access FlowFuse with a single set of login credentials, improving security, user experience, and save them time.</p>"
       - id: hipaa
         label: BAA for Hipaa
-        cloudValues: [ null, null, null, 'check' ]
+        cloudValues: [ null, null, 'check' ]
         selfHostedValues: [ null, 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Ensure FlowFuse properly safeguards protected health information (PHI) they handle on your business's behalf, mitigating the risk of data breaches and potential HIPAA violations.</p>"
@@ -177,24 +177,24 @@ sections:
         info: "<p>FlowFuse allows multiple team members to collaborate on the same Node-RED flows.</p>"
       - id: team-members
         label: Team Members
-        cloudValues: [ '1', '2', '20', 'Unlimited' ]
+        cloudValues: [ '2', '20', 'Unlimited' ]
         selfHostedValues: [ '20', 'Unlimited' ]        
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>FlowFuse allows multiple team members to collaborate on the same Node-RED flows.</p>"
       - id: blueprints-cloud
         label: Access to Blueprints
-        cloudValues: [ null, 'check', 'check', 'check' ]
+        cloudValues: [ 'check', 'check', 'check' ]
         tags: [ 'cloud' ]
         info: "<p><a href='https://flowfuse.com/blog/2023/10/blueprints/' target='blank'>FlowFuse's Blueprints</a> simplify Node-RED deployments by offering pre-built, customizable flows for specific use cases.</p>"
       - id: dashboard
         label: Node-RED Dashboard
-        cloudValues: [ 'check', 'check', 'check', 'check' ]
+        cloudValues: [ 'check', 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Visualize your data with the powerful and intuitive <a href='https://dashboard.flowfuse.com' target='blank'>Node-RED Dashboard</a></p>"
       - id: multi-user-dashboard
         label: Personalised Multi-user Dashboards
-        cloudValues: [ null, null, 'check', 'check' ]
+        cloudValues: [ null, 'check', 'check' ]
         selfHostedValues: [ 'check', 'check' ]
         tags: [ 'cloud', 'self-hosted' ]
         info: "<p>Personalised Multi-user Dashboard allow you to build applications that provide unique data to each user <a href='https://flowfuse.com/blog/2024/01/dashboard-2-multi-user' target='blank'>Learn more</a></p>"
@@ -210,9 +210,6 @@ sections:
         info: "<p>Setup standard nodes and flows that can be shared with all team members.</p>"
 buttons: 
   cloud:
-    - cta: GET STARTED
-      url: https://app.flowfuse.com/account/create
-      onclick: "capture('cta-join', {'position': 'secondary'}, {'plan': 'cloud-free'})"
     - cta: TRY FOR FREE
       url: https://app.flowfuse.com/account/create
       onclick: "capture('cta-join', {'position': 'secondary'}, {'plan': 'cloud-starter'})"
@@ -228,4 +225,4 @@ buttons:
       onclick: "capture('cta-install', {'position': 'secondary'}, {'plan': 'sh-starter'})"
     - cta: Request a Quote
       url: /pricing/request-quote/
-      onclick: "capture('cta-request-quote', {'position': 'secondary'}, {'plan': 'sh-enterprise'})"
+      onclick: "capture('cta-request-quote', {'position': 'secondary'}, {'plan': 'sh-enterprise'})"
\ No newline at end of file
diff --git a/src/_includes/feature_lists/features-table-base.njk b/src/_includes/feature_lists/features-table-base.njk
index cd37c96925..09aa6a9ee6 100644
--- a/src/_includes/feature_lists/features-table-base.njk
+++ b/src/_includes/feature_lists/features-table-base.njk
@@ -1,11 +1,8 @@
 <div class="ff-feature-table m-auto">
     <ul class="{{ hosting }} ff-feature-table-section sticky top-0 md:top-14 z-10">
         <li class="ff-feature--column-header">
-            <span class="sticky left-0 h-full"></span>
+            <span class="sticky left-0 h-full bg-white"></span>
             {% if hosting == "cloud" %}
-            <label class="mr-2">
-                <div>Free</div>
-            </label>
             <label class="mr-2">
                 <div>Starter</div>
             </label>
diff --git a/src/css/style.css b/src/css/style.css
index ea6b68f1d0..08931a60c2 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -1226,7 +1226,7 @@ h4:hover .header-anchor {
     
     .ff-feature-table-section li {
         display: grid;
-        grid-template-columns: 270px 1fr 1fr 1fr 1fr;
+        grid-template-columns: 270px 1fr 1fr 1fr;
         align-items: center;
         @apply bg-indigo-50/30;
     }
@@ -1241,7 +1241,7 @@ h4:hover .header-anchor {
     
     @media (max-width: 720px) {
         .ff-feature-table-section li {
-            grid-template-columns: 220px 1fr 1fr 1fr 1fr;
+            grid-template-columns: 220px 1fr 1fr 1fr;
         }
         .self-hosted.ff-feature-table-section li {
             grid-template-columns: 220px 1fr 1fr;
@@ -1250,7 +1250,7 @@ h4:hover .header-anchor {
 
     @media (max-width: 680px) {
         .ff-feature-table-section li {
-            grid-template-columns: 170px 1fr 1fr 1fr 1fr;
+            grid-template-columns: 170px 1fr 1fr 1fr;
         }
         .self-hosted.ff-feature-table-section li {
             grid-template-columns: 170px 1fr 1fr;
diff --git a/src/css/style.page.css b/src/css/style.page.css
index 71ed25b5e0..68c4104a33 100644
--- a/src/css/style.page.css
+++ b/src/css/style.page.css
@@ -145,7 +145,7 @@
 @layer components {
     .pricing-tiles {
         position: relative;
-        grid-template-columns: 1fr 1fr 1fr 1fr;
+        grid-template-columns: 1fr 1fr 1fr;
         gap: 20px;
         z-index: 2;
         margin-left: auto;
diff --git a/src/pricing/index.njk b/src/pricing/index.njk
index c860b44b8f..f52e136db3 100644
--- a/src/pricing/index.njk
+++ b/src/pricing/index.njk
@@ -11,9 +11,6 @@ meta:
         - question: "Does FlowFuse offer annual discounts for FlowFuse Cloud?"
           answer: >
             Yes, Team customers on an annual subscription receive a 20% discount off of the monthly subscription price. Please reach out to request the discount. Please <a href="/contact-us/">reach out</a> to request the discount.
-        - question: "Why is self-hosted the same price as cloud?"
-          answer: >
-            Self-hosted environments require more support and configuration than FlowFuse Cloud, which offset any resources saved.
         - question: "Are flat-fee or site-wide licenses available?"
           answer: >
             It is not possible at this time to purchase an unlimited-use license, but contact us to discuss pricing for your unique use case.
@@ -61,43 +58,7 @@ hubspot:
             <!-- Plans -->
             <!-- Cloud -->
             <div class="contentCloud m-auto transition duration-1000 md:min-h-[502px]">
-                <div class="pricing-tiles flex flex-col md:grid md:max-lg:grid-cols-2 lg:max-w-screen-2xl mt-4 md:mt-0">
-                    <!-- Free -->
-                    <div class="pricing-tile md:h-full">
-                        <div class="pricing-tile-background pb-6 md:grid md:grid-rows-[auto_1fr_minmax(36px,_36px)]">
-                            <div>
-                                <div class="flex flex-col items-center text-left md:flex-row md:mb-6 md:px-0 md:block md:min-h-[133px]">
-                                    <div class="flex flex-row justify-between mt-4 w-full gap-x-2">
-                                        <h4 style="display:inline-block;">Free</h4>
-                                    </div>
-                                    <p class="mt-7">For edge device management. Free to you.</p>
-                                </div>
-                                <div class="flex flex-col content-start features md:mt-3 mt-6 w-full">
-                                    <note class="font-semibold">2 remote instances, and includes:
-                                    </note>
-                                    <ul class="ff-checklist font-light leading-7 mt-2">
-                                        <li>1 Team member</li>
-                                        <li>Device auto snapshots</li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <div data-nosnippet class="flex">
-                                <!-- Price -->
-                                <div class="mt-9 md:mt-12 md:text-left items-left w-full mb-11 md:mb-5 flex flex-row md:self-end">
-                                    <div class="text-left flex flex-row md:self-end">
-                                        <div class="mr-1">
-                                            <h2 class="self-end pb-1">
-                                                Free
-                                            </h2>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <a class="md:self-end ff-btn ff-btn--primary uppercase align-baseline w-full"
-                                href="{{ site.appURL }}/account/create"
-                                onclick="capture('cta-join', {'position': 'primary'}, {'plan': 'cloud-free'})">GET STARTED</a>
-                        </div>
-                    </div>
+                <div class="pricing-tiles flex flex-col md:grid md:max-lg lg:max-w-screen-xl mt-4 md:mt-0">
                     <!-- Starter -->
                     <div class="pricing-tile md:h-full">
                         <div class="pricing-tile-background pb-6 md:grid md:grid-rows-[auto_1fr_minmax(36px,_36px)]">
@@ -106,14 +67,14 @@ hubspot:
                                     <div class="flex flex-row justify-between mt-4 w-full gap-x-2">
                                         <h4 style="display:inline-block;">Starter</h4>
                                     </div>
-                                    <p class="mt-7"><span class="inline font-normal">For smaller-scale applications. </span>The fastest, easiest way to host <span class="inline-block">Node-RED</span> instances.</p>
+                                    <p class="mt-7">Get started with <span class="inline font-normal">AI-enhanced </span><span class="inline-block font-normal">Node-RED</span> in the cloud.</p>
                                 </div>
                                 <div class="flex flex-col content-start features md:mt-3 mt-6 w-full">
                                     <note class="font-semibold">Starts at 2 hosted instances, 2 remote instances, and includes:
                                     </note>
                                     <ul class="ff-checklist font-light leading-7 mt-2">
+                                        <li>AI Node-RED features</li>
                                         <li>2 Team members</li>
-                                        <li>Device management</li>
                                         <li>Device Auto Snapshots</li>
                                         <li>Blueprints</li>
                                         <li>Option to upgrade up to 3 hosted/3 remote instances</li>
@@ -152,13 +113,13 @@ hubspot:
                                     <div class="flex flex-row justify-between mt-4 w-full gap-x-2">
                                         <h4 style="display:inline-block;">Team</h4>
                                     </div>
-                                    <p class="mt-7">Empower your <span class="inline font-normal">Node-RED developer
-                                            teams</span> with the collaborative features of FlowFuse{% if cloud %} Cloud.{% else %}.{% endif %}</p>
+                                    <p class="mt-7"><span class="inline font-normal">Build bespoke applications collaboratively</span>, empower developer teams in your organization or small business.</p>
                                 </div>
                                 <div class="flex flex-col content-start features md:mt-3 mt-6 w-full">
                                     <note class="font-semibold">Starts at {% if cloud %}5{% else %}10{% endif %} hosted instances or remote instances, and includes:
                                     </note>
                                     <ul class="ff-checklist font-light leading-7 mt-2">
+                                        <li>AI Node-RED features</li>
                                         <li>20 Team members</li>
                                         <li>Team collaboration</li>
                                         <li>MQTT Broker (8 clients to start)</li>
@@ -214,6 +175,7 @@ hubspot:
                                 <div class="flex flex-col content-start features md:mt-3 mt-6 w-full">
                                     <note class="font-semibold">Starts at 20 hosted instances or remote instances, and includes:</note>
                                     <ul class="ff-checklist font-light leading-7 mt-2">
+                                        <li>AI Node-RED features</li>
                                         <li>Unlimited team members</li>
                                         <li>Single Sign-On</li>
                                         {% if cloud %}
@@ -245,9 +207,9 @@ hubspot:
                     {{ enterprise() }}
                 </div>
             </div>
-            <!-- Self-hosted -->
+            <!-- Self-Hosted -->
             <div class="contentSelfHosted hide m-auto transition duration-1000 md:min-h-[502px]">
-                <div class="pricing-tiles flex flex-col md:grid md:max-w-screen-sm mt-4 md:mt-0">
+                <div class="pricing-tiles flex flex-col md:grid md:max-w-screen-md mt-4 md:mt-0">
                     <!-- Team -->
                     <div class="pricing-tile md:h-full">
                         {{ team(false) }}
diff --git a/src/product/cloud.njk b/src/product/cloud.njk
index 2b8438586b..324454c472 100644
--- a/src/product/cloud.njk
+++ b/src/product/cloud.njk
@@ -8,7 +8,7 @@ meta:
     faq:
         - question: "How much does FlowFuse Cloud cost?"
           answer: >
-            After the 2-week free trial, the Starter Tier costs $15 a month for 2 team members, 2 Node-RED instances and 2 Devices. For more details on advanced tiers and features see <a href='/pricing/'>Pricing</a>.
+            After the 2-week free trial, the Starter Tier costs $20 a month for 2 team members, 2 hosted Node-RED instances and 2 remote Node-RED instances. For more details on advanced tiers and features see <a href='/pricing/'>Pricing</a>.
         - question: "Does FlowFuse offer annual discounts for FlowFuse Cloud?"    
           answer: >
             Yes, we offer a 10% discount for annual subscriptions. Please <a href='/contact-us/'>reach out</a> to request the discount.