diff --git a/app/views/gemfiles/show.html.erb b/app/views/gemfiles/show.html.erb
index 0e00327..9b830fd 100644
--- a/app/views/gemfiles/show.html.erb
+++ b/app/views/gemfiles/show.html.erb
@@ -1,3 +1,6 @@
+<% content_for :title, "Audit Tool - Report ##{@alpha_id}" %>
+<% content_for :description, "Report ##{@alpha_id} - #{@vulnerabilities_count} Vulnerabilities found on your file" %>
+
 <% content_for :script do %>
   <script>
     $('html, body').animate({
diff --git a/app/views/home/privacy.html.erb b/app/views/home/privacy.html.erb
index 6be02b3..95d0771 100644
--- a/app/views/home/privacy.html.erb
+++ b/app/views/home/privacy.html.erb
@@ -1,3 +1,6 @@
+<% content_for :title, "Privacy Policy | FastRuby.io Audit Tool" %>
+<% content_for :description, "How the FastRuby.io Audit Tool collects, uses, and protects information about you." %>
+
 <div class="header" id="header_privacy">
     <h1>Privacy Policy</h1>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 11731e2..83c41ad 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,13 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <% if controller_name == 'gemfiles' %>
-      <title>Audit Tool - Report #<%= @alpha_id %></title>
-      <meta name="description" content="Report #<%= @alpha_id %> - <%= @vulnerabilities_count %> Vulnerabilities found on your file"/>
-    <% else %>
-      <title>Audit Tool</title>
-      <meta name="description" content="Upload your Gemfile.lock to find vulnerabilities in your application"/>
-    <% end %>
+    <title><%= content_for?(:title) ? yield(:title) : t('meta.default_title') %></title>
+    <meta name="description" content="<%= content_for?(:description) ? yield(:description) : t('meta.default_description') %>"/>
 
 
     <%= csrf_meta_tags %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0120a93..592952a 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -21,6 +21,10 @@
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
+  config.public_file_server.headers = {
+    'Cache-Control' => "public, max-age=#{1.week.to_i}"
+  }
+
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :terser
   # config.assets.css_compressor = :sass
diff --git a/config/locales/en.yml b/config/locales/en.yml
index decc5a8..f4c5223 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -31,3 +31,6 @@
 
 en:
   hello: "Hello world"
+  meta:
+    default_title: "Free Gemfile.lock Vulnerability Scanner | FastRuby.io"
+    default_description: "Upload your Gemfile.lock to find vulnerabilities in your application"
