diff --git a/Procfile.dev b/Procfile.dev
index 319b4a58..9e327d9a 100644
--- a/Procfile.dev
+++ b/Procfile.dev
@@ -1,3 +1,3 @@
 web: bundle exec puma -C config/puma.rb
-css: bin/rails tailwindcss:watch
+css: bin/rails tailwindcss:watch[always]
 vite: bin/vite dev
diff --git a/app/assets/images/arturo_edo.png b/app/assets/images/arturo_edo.png
new file mode 100644
index 00000000..c2d3c993
Binary files /dev/null and b/app/assets/images/arturo_edo.png differ
diff --git a/app/assets/images/flavio_wuensche.png b/app/assets/images/flavio_wuensche.png
new file mode 100644
index 00000000..0b083042
Binary files /dev/null and b/app/assets/images/flavio_wuensche.png differ
diff --git a/app/views/components/_footer.html.erb b/app/views/components/_footer.html.erb
new file mode 100644
index 00000000..f0a6582d
--- /dev/null
+++ b/app/views/components/_footer.html.erb
@@ -0,0 +1,35 @@
+<hr class="my-6 border-gray-200 sm:mx-auto dark:border-gray-700 lg:my-8" />
+
+<footer class="sm:flex sm:items-center sm:justify-between pb-9">
+  <span class="text-sm text-gray-500 sm:text-center dark:text-gray-400">
+    © <%= Date.current.year %> Cherry™. All Rights Reserved.
+  </span>
+  <ul class="flex flex-wrap items-center mb-6 text-sm text-gray-500 sm:mb-0 dark:text-gray-400 ml-auto mr-2 mt-4 md:mt-0">
+    <li>
+      <a href="/privacy" class="mr-4 hover:underline md:mr-6">Privacy</a>
+    </li>
+    <li>
+      <a href="/terms" class="mr-4 hover:underline md:mr-6">Terms</a>
+    </li>
+  </ul>
+  <div class="flex mt-4 space-x-6 sm:justify-center sm:mt-0">
+    <a href="https://x.com/fwuensche" target="_blank" rel="noopener noreferrer"
+       class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
+      <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
+        <path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/>
+      </svg>
+    </a>
+    <a href="https://npmjs.com/package/cherrypush" target="_blank" rel="noopener noreferrer"
+       class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
+      <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 576 512" xmlns="http://www.w3.org/2000/svg">
+        <path d="M288 288h-32v-64h32v64zm288-128v192H288v32H160v-32H0V160h576zm-416 32H32v128h64v-96h32v96h32V192zm160 0H192v160h64v-32h64V192zm224 0H352v128h64v-96h32v96h32v-96h32v96h32V192z"/>
+      </svg>
+    </a>
+    <a href="https://github.com/cherrypush/cherrypush.com" target="_blank" rel="noopener noreferrer"
+       class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
+      <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 496 512" xmlns="http://www.w3.org/2000/svg">
+        <path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.8-14.9-112.8-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/>
+      </svg>
+    </a>
+  </div>
+</footer>
diff --git a/app/views/components/_testimonials.html.erb b/app/views/components/_testimonials.html.erb
index e08034ab..d3882c20 100644
--- a/app/views/components/_testimonials.html.erb
+++ b/app/views/components/_testimonials.html.erb
@@ -3,8 +3,7 @@
     {
       name: 'Arturo Edo',
       position: 'CEO, Reserva Ink',
-      image_url:
-        'https://media.licdn.com/dms/image/C4E03AQHo6sKhi6s9hA/profile-displayphoto-shrink_200_200/0/1516962323454?e=2147483647&v=beta&t=-eUs5z2Lf8XoZU21T82fxzvwLHE7YmPIZg__RRzI8G0',
+      image_url: asset_path('arturo_edo.png'),
       heading: 'Clean code, happy devs',
       text:
         "Cherry is just what we needed to keep track of our technical debt. It's a great tool to keep our codebase clean and our developers motivated.",
@@ -12,7 +11,7 @@
     {
       name: 'Flavio Wuensche',
       position: 'Staff Engineer, Doctolib',
-      image_url: 'https://pbs.twimg.com/profile_images/1230153026515742727/DsPePwIM_400x400.jpg',
+      image_url: asset_path('flavio_wuensche.png'),
       heading: 'Perfect for code migrations',
       text:
         "I'm the creator of the tool and surely biased here, but I truly think Cherry is the perfect tool for code migrations, especially in large codebases and with multiple teams.",
diff --git a/app/views/layouts/landing.html.erb b/app/views/layouts/landing.html.erb
index ceedd00c..ae73e830 100644
--- a/app/views/layouts/landing.html.erb
+++ b/app/views/layouts/landing.html.erb
@@ -10,7 +10,7 @@
     <div class="container mt-8">
       <%= render 'components/alerts' %>
       <%= yield %>
-      <%= react_component 'Footer' %>
+      <%= render 'components/footer' %>
     </div>
   </body>
 </html>
diff --git a/bin/dev b/bin/dev
index c7513e16..e26cb971 100755
--- a/bin/dev
+++ b/bin/dev
@@ -1,6 +1,8 @@
 #!/usr/bin/env sh
 
 export PORT="${PORT:-3001}"
+# Prevent Puma workers from crashing on macOS due to fork() safety checks (NSCharacterSet)
+export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 
 if ! gem list foreman -i --silent; then
   echo "Installing foreman..."