diff --git a/_includes/canonical.html b/_includes/canonical.html
new file mode 100644
index 0000000..4f5c9bd
--- /dev/null
+++ b/_includes/canonical.html
@@ -0,0 +1,2 @@
+{%- unless no_index -%}<link rel="canonical" href="https://www.completemarquees.co.uk{{ page.url }}" />
+{% endunless -%}
diff --git a/_includes/packages-body.html b/_includes/packages-body.html
index 0f7de3f..491b3de 100644
--- a/_includes/packages-body.html
+++ b/_includes/packages-body.html
@@ -1,7 +1,7 @@
 {% include "html-head-open.html" %}
   <title>Capri marquee hire Packages - complete marquees</title>
   <meta name="description" content="Complete Marquees packages. Examples of our most popular packages Covering, Hampshire, Surrey and West Wessex. Capri Marquee hire, pagodas" />
-  <link rel="canonical" href="{{ canonical }}" />
+  {% include "canonical.html" %}
   {% include "og-meta-static.html" %}
   <meta property="og:title" content="Capri marquee hire Packages - complete marquees" />
   <meta property="og:description" content="Complete Marquees packages. Examples of our most popular packages Covering, Hampshire, Surrey and West Wessex. Capri Marquee hire, pagodas" />
diff --git a/_includes/sizes-prices-body.html b/_includes/sizes-prices-body.html
index 5377003..fd1374b 100644
--- a/_includes/sizes-prices-body.html
+++ b/_includes/sizes-prices-body.html
@@ -1,7 +1,7 @@
 {% include "html-head-open.html" %}
   <title>Sizes and Prices | Complete Marquees</title>
   <meta name="description" content="Marquee hire prices for Capri and Pagoda marquees. Ideal for weddings, garden parties, and corporate events in Hampshire, Surrey &amp; Sussex." />
-  <link rel="canonical" href="{{ canonical }}" />
+  {% include "canonical.html" %}
   {% include "og-meta-static.html" %}
   <meta property="og:title" content="Sizes and Prices | Complete Marquees" />
   <meta property="og:description" content="Marquee hire prices for Capri and Pagoda marquees. Ideal for weddings, garden parties, and corporate events in Hampshire, Surrey &amp; Sussex." />
diff --git a/_layouts/complete-marquees.html b/_layouts/complete-marquees.html
index 0aa3347..6b7c7ca 100644
--- a/_layouts/complete-marquees.html
+++ b/_layouts/complete-marquees.html
@@ -2,6 +2,7 @@
   <title>{{ meta_title }} - Complete Marquees</title>
   {% if meta_description %}<meta name="description" content="{{ meta_description }}" />{% endif %}
   {% if no_index %}<meta name="robots" content="noindex, nofollow" />{% endif %}
+  {% include "canonical.html" %}
   {% include "og-meta-static.html" %}
   {% include "head.html" %}
 </head>
diff --git a/_layouts/location.html b/_layouts/location.html
index 7338596..9eddec5 100644
--- a/_layouts/location.html
+++ b/_layouts/location.html
@@ -3,7 +3,7 @@
 {% include "html-head-open.html" %}
   <title>{{ title_h }}</title>
   <meta name="description" content="{{ meta_description_h }}" />
-  <link rel="canonical" href="./" />
+  {% include "canonical.html" %}
   <meta property="og:locale" content="en_GB" />
   <meta property="og:type" content="article" />
   <meta property="og:title" content="{{ title_h }}" />
diff --git a/_layouts/yoast-page.html b/_layouts/yoast-page.html
index af55330..3227da7 100644
--- a/_layouts/yoast-page.html
+++ b/_layouts/yoast-page.html
@@ -3,7 +3,7 @@
 {% include "html-head-open.html" %}
   <title>{{ title_h }}</title>
   <meta name="description" content="{{ meta_description_h }}" />
-  <link rel="canonical" href="./" />
+  {% include "canonical.html" %}
   {% include "og-meta-static.html" %}
   <meta property="og:title" content="{{ title_h }}" />
   <meta property="og:description" content="{{ meta_description_h }}" />
diff --git a/client-testimonials.html b/client-testimonials.html
index 6ec803b..1e2588a 100644
--- a/client-testimonials.html
+++ b/client-testimonials.html
@@ -4,7 +4,7 @@
 {% include "html-head-open.html" %}
   <title>Complete Marquees Testimonials, Party Marquee Hire</title>
   <meta name="description" content="client&#039;s testimonials for clomete marquees" />
-  <link rel="canonical" href="./" />
+  {% include "canonical.html" %}
   {% include "og-meta-static.html" %}
   <meta property="og:title" content="Complete Marquees Testimonials, Party Marquee Hire" />
   <meta property="og:description" content="client&#039;s testimonials for clomete marquees" />
diff --git a/contact-us.html b/contact-us.html
index b59be8d..7cd79ac 100644
--- a/contact-us.html
+++ b/contact-us.html
@@ -4,7 +4,7 @@
 {% include "html-head-open.html" %}
   <title>Complete Marquees contact us- capri marquee hire</title>
   <meta name="description" content="Contact Complete Marquees on 01428751745. Capri marquee hire for any event in Hampshire, Surrey and West Sussex." />
-  <link rel="canonical" href="./" />
+  {% include "canonical.html" %}
   {% include "og-meta-static.html" %}
   <meta property="og:title" content="Complete Marquees contact us- capri marquee hire" />
   <meta property="og:description" content="Contact Complete Marquees on 01428751745. Capri marquee hire for any event in Hampshire, Surrey and West Sussex." />
diff --git a/index.html b/index.html
index 297a614..40b2d55 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 {% include "html-head-open.html" %}
   <title>Complete Marquees - Marquee Hire Surrey, Hampshire, sussex</title>
   <meta name="description" content="Complete Marquees, Marquees for Weddings, Parties, Festivals, Birthdays and Social Events in Surrey, Hampshire, West Sussex" />
-  <link rel="canonical" href="./" />
+  {% include "canonical.html" %}
   {% include "og-meta-static.html" %}
   <meta property="og:title" content="Complete Marquees - Marquee Hire Surrey, Hampshire, sussex" />
   <meta property="og:description" content="Complete Marquees, Marquees for Weddings, Parties, Festivals, Birthdays and Social Events in Surrey, Hampshire, West Sussex" />
diff --git a/packages-capri-marquee-hire.html b/packages-capri-marquee-hire.html
index e29273e..38eadd2 100644
--- a/packages-capri-marquee-hire.html
+++ b/packages-capri-marquee-hire.html
@@ -1,4 +1,4 @@
 ---
 permalink: "/packages-capri-marquee-hire/"
 ---
-{% include "packages-body.html", canonical: "../packages/" %}
+{% include "packages-body.html" %}
diff --git a/packages.html b/packages.html
index 5b63170..9f42f8d 100644
--- a/packages.html
+++ b/packages.html
@@ -1,4 +1,4 @@
 ---
 permalink: "/packages/"
 ---
-{% include "packages-body.html", canonical: "./" %}
+{% include "packages-body.html" %}
diff --git a/sizes-prices-capri-marquees.html b/sizes-prices-capri-marquees.html
index 49a694f..5cfde4d 100644
--- a/sizes-prices-capri-marquees.html
+++ b/sizes-prices-capri-marquees.html
@@ -1,4 +1,4 @@
 ---
 permalink: "/sizes-prices-capri-marquees/"
 ---
-{% include "sizes-prices-body.html", canonical: "../sizes-prices/" %}
+{% include "sizes-prices-body.html" %}
diff --git a/sizes-prices.html b/sizes-prices.html
index be7b8ed..10e6ad0 100644
--- a/sizes-prices.html
+++ b/sizes-prices.html
@@ -3,4 +3,4 @@
 redirect_from:
   - /marquee-hire-prices
 ---
-{% include "sizes-prices-body.html", canonical: "./" %}
+{% include "sizes-prices-body.html" %}