diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 37cfeefd..da9a722c 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -278,6 +278,43 @@
             <field id="enabled">1</field>
           </depends>
         </field>
+        <field
+                id="checkout_only"
+                type="select"
+                translate="label"
+                sortOrder="80"
+                showInDefault="1"
+                showInWebsite="1"
+                showInStore="1"
+        >
+          <label>Load source script only on checkout pages</label>
+          <comment>
+            This option force to load our solution only on checkout page in store front. Please be sure that it is desired way to operate.
+          </comment>
+          <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+          <config_path>idealpostcodes/settings/checkout_only</config_path>
+          <depends>
+            <field id="enabled">1</field>
+          </depends>
+        </field>
+        <field
+                id="match_checkout_page"
+                type="text"
+                translate="label,comment"
+                sortOrder="80"
+                showInDefault="1"
+                showInWebsite="1"
+                showInStore="1"
+        >
+          <label>Checkout Page Url Regex</label>
+          <comment>
+            Here you can change regex to match your checkout url. Default is generic one from basic magento install
+          </comment>
+          <config_path>idealpostcodes/settings/match_checkout_page</config_path>
+          <depends>
+            <field id="checkout_only">1</field>
+          </depends>
+        </field>
       </group>
     </section>
   </system>
diff --git a/etc/config.xml b/etc/config.xml
index d9283736..7ac7fc7e 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -17,6 +17,8 @@
         <autocomplete_override>{}</autocomplete_override>
         <postcode_lookup_override>{}</postcode_lookup_override>
         <custom_fields>[]</custom_fields>
+        <checkout_only>0</checkout_only>
+        <match_checkout_page>\/checkout</match_checkout_page>
       </settings>
     </idealpostcodes>
   </default>
diff --git a/package-lock.json b/package-lock.json
index bca1b0b8..995b0ef9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5270,27 +5270,19 @@
         "@octokit/types": "^6.0.3"
       }
     },
-    "node_modules/@octokit/auth-token/node_modules/@octokit/types": {
-      "version": "6.31.3",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-      "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/openapi-types": "^10.6.4"
-      }
-    },
     "node_modules/@octokit/core": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.4.tgz",
-      "integrity": "sha512-HCp8yKQfTITYK+Nd09MHzAlP1v3Ii/oCohv0/TW9rhSLvzb98BOVs2QmVYuloE6a3l6LsfyGIwb6Pc4ycgWlIQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
       "dev": true,
       "dependencies": {
-        "@octokit/auth-token": "^2.4.0",
-        "@octokit/graphql": "^4.3.1",
-        "@octokit/request": "^5.4.0",
-        "@octokit/types": "^5.0.0",
-        "before-after-hook": "^2.1.0",
-        "universal-user-agent": "^5.0.0"
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.6.3",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
       }
     },
     "node_modules/@octokit/endpoint": {
@@ -5304,21 +5296,6 @@
         "universal-user-agent": "^6.0.0"
       }
     },
-    "node_modules/@octokit/endpoint/node_modules/@octokit/types": {
-      "version": "6.31.3",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-      "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/openapi-types": "^10.6.4"
-      }
-    },
-    "node_modules/@octokit/endpoint/node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-      "dev": true
-    },
     "node_modules/@octokit/graphql": {
       "version": "4.8.0",
       "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz",
@@ -5330,25 +5307,10 @@
         "universal-user-agent": "^6.0.0"
       }
     },
-    "node_modules/@octokit/graphql/node_modules/@octokit/types": {
-      "version": "6.31.3",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-      "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/openapi-types": "^10.6.4"
-      }
-    },
-    "node_modules/@octokit/graphql/node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-      "dev": true
-    },
     "node_modules/@octokit/openapi-types": {
-      "version": "10.6.4",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.6.4.tgz",
-      "integrity": "sha512-JVmwWzYTIs6jACYOwD6zu5rdrqGIYsiAsLzTCxdrWIPNKNVjEF6vPTL20shmgJ4qZsq7WPBcLXLsaQD+NLChfg==",
+      "version": "12.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.8.0.tgz",
+      "integrity": "sha512-ydcKLs2KKcxlhpdWLzJxEBDEk/U5MUeqtqkXlrtAUXXFPs6vLl1PEGghFC/BbpleosB7iXs0Z4P2DGe7ZT5ZNg==",
       "dev": true
     },
     "node_modules/@octokit/plugin-paginate-rest": {
@@ -5363,15 +5325,6 @@
         "@octokit/core": ">=2"
       }
     },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
-      "version": "6.31.3",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-      "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/openapi-types": "^10.6.4"
-      }
-    },
     "node_modules/@octokit/plugin-request-log": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz",
@@ -5401,16 +5354,16 @@
       }
     },
     "node_modules/@octokit/request": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz",
-      "integrity": "sha512-je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
       "dev": true,
       "dependencies": {
         "@octokit/endpoint": "^6.0.1",
         "@octokit/request-error": "^2.1.0",
         "@octokit/types": "^6.16.1",
         "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.7",
         "universal-user-agent": "^6.0.0"
       }
     },
@@ -5425,30 +5378,6 @@
         "once": "^1.4.0"
       }
     },
-    "node_modules/@octokit/request-error/node_modules/@octokit/types": {
-      "version": "6.31.3",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-      "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/openapi-types": "^10.6.4"
-      }
-    },
-    "node_modules/@octokit/request/node_modules/@octokit/types": {
-      "version": "6.31.3",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-      "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/openapi-types": "^10.6.4"
-      }
-    },
-    "node_modules/@octokit/request/node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-      "dev": true
-    },
     "node_modules/@octokit/rest": {
       "version": "17.11.2",
       "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-17.11.2.tgz",
@@ -5461,7 +5390,21 @@
         "@octokit/plugin-rest-endpoint-methods": "3.17.0"
       }
     },
-    "node_modules/@octokit/types": {
+    "node_modules/@octokit/rest/node_modules/@octokit/core": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.4.tgz",
+      "integrity": "sha512-HCp8yKQfTITYK+Nd09MHzAlP1v3Ii/oCohv0/TW9rhSLvzb98BOVs2QmVYuloE6a3l6LsfyGIwb6Pc4ycgWlIQ==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/auth-token": "^2.4.0",
+        "@octokit/graphql": "^4.3.1",
+        "@octokit/request": "^5.4.0",
+        "@octokit/types": "^5.0.0",
+        "before-after-hook": "^2.1.0",
+        "universal-user-agent": "^5.0.0"
+      }
+    },
+    "node_modules/@octokit/rest/node_modules/@octokit/types": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz",
       "integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==",
@@ -5470,6 +5413,24 @@
         "@types/node": ">= 8"
       }
     },
+    "node_modules/@octokit/rest/node_modules/universal-user-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
+      "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
+      "dev": true,
+      "dependencies": {
+        "os-name": "^3.1.0"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "6.39.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.39.0.tgz",
+      "integrity": "sha512-Mq4N9sOAYCitTsBtDdRVrBE80lIrMBhL9Jbrw0d+j96BAzlq4V+GLHFJbHokEsVvO/9tQupQdoFdgVYhD2C8UQ==",
+      "dev": true,
+      "dependencies": {
+        "@octokit/openapi-types": "^12.7.0"
+      }
+    },
     "node_modules/@prettier/plugin-php": {
       "version": "0.18.4",
       "resolved": "https://registry.npmjs.org/@prettier/plugin-php/-/plugin-php-0.18.4.tgz",
@@ -10621,15 +10582,23 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dev": true,
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
       "engines": {
         "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
     "node_modules/node-releases": {
@@ -16383,27 +16352,6 @@
         "node": ">=16 || ^14.17"
       }
     },
-    "node_modules/semantic-release/node_modules/@octokit/core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/auth-token": "^2.4.4",
-        "@octokit/graphql": "^4.5.8",
-        "@octokit/request": "^5.6.3",
-        "@octokit/request-error": "^2.0.5",
-        "@octokit/types": "^6.0.3",
-        "before-after-hook": "^2.2.0",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
-    "node_modules/semantic-release/node_modules/@octokit/openapi-types": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-      "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==",
-      "dev": true
-    },
     "node_modules/semantic-release/node_modules/@octokit/plugin-paginate-rest": {
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
@@ -16429,20 +16377,6 @@
         "@octokit/core": ">=3"
       }
     },
-    "node_modules/semantic-release/node_modules/@octokit/request": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/endpoint": "^6.0.1",
-        "@octokit/request-error": "^2.1.0",
-        "@octokit/types": "^6.16.1",
-        "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.7",
-        "universal-user-agent": "^6.0.0"
-      }
-    },
     "node_modules/semantic-release/node_modules/@octokit/rest": {
       "version": "18.12.0",
       "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz",
@@ -16455,15 +16389,6 @@
         "@octokit/plugin-rest-endpoint-methods": "^5.12.0"
       }
     },
-    "node_modules/semantic-release/node_modules/@octokit/types": {
-      "version": "6.34.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-      "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
-      "dev": true,
-      "dependencies": {
-        "@octokit/openapi-types": "^11.2.0"
-      }
-    },
     "node_modules/semantic-release/node_modules/@semantic-release/commit-analyzer": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-9.0.2.tgz",
@@ -16709,26 +16634,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/semantic-release/node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/semantic-release/node_modules/normalize-url": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
@@ -19193,12 +19098,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/semantic-release/node_modules/universal-user-agent": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-      "dev": true
-    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -20086,13 +19985,10 @@
       }
     },
     "node_modules/universal-user-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
-      "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
-      "dev": true,
-      "dependencies": {
-        "os-name": "^3.1.0"
-      }
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
+      "dev": true
     },
     "node_modules/universalify": {
       "version": "2.0.0",
@@ -24401,31 +24297,21 @@
       "dev": true,
       "requires": {
         "@octokit/types": "^6.0.3"
-      },
-      "dependencies": {
-        "@octokit/types": {
-          "version": "6.31.3",
-          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-          "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-          "dev": true,
-          "requires": {
-            "@octokit/openapi-types": "^10.6.4"
-          }
-        }
       }
     },
     "@octokit/core": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.4.tgz",
-      "integrity": "sha512-HCp8yKQfTITYK+Nd09MHzAlP1v3Ii/oCohv0/TW9rhSLvzb98BOVs2QmVYuloE6a3l6LsfyGIwb6Pc4ycgWlIQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
+      "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
       "dev": true,
       "requires": {
-        "@octokit/auth-token": "^2.4.0",
-        "@octokit/graphql": "^4.3.1",
-        "@octokit/request": "^5.4.0",
-        "@octokit/types": "^5.0.0",
-        "before-after-hook": "^2.1.0",
-        "universal-user-agent": "^5.0.0"
+        "@octokit/auth-token": "^2.4.4",
+        "@octokit/graphql": "^4.5.8",
+        "@octokit/request": "^5.6.3",
+        "@octokit/request-error": "^2.0.5",
+        "@octokit/types": "^6.0.3",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
       }
     },
     "@octokit/endpoint": {
@@ -24437,23 +24323,6 @@
         "@octokit/types": "^6.0.3",
         "is-plain-object": "^5.0.0",
         "universal-user-agent": "^6.0.0"
-      },
-      "dependencies": {
-        "@octokit/types": {
-          "version": "6.31.3",
-          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-          "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-          "dev": true,
-          "requires": {
-            "@octokit/openapi-types": "^10.6.4"
-          }
-        },
-        "universal-user-agent": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-          "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-          "dev": true
-        }
       }
     },
     "@octokit/graphql": {
@@ -24465,29 +24334,12 @@
         "@octokit/request": "^5.6.0",
         "@octokit/types": "^6.0.3",
         "universal-user-agent": "^6.0.0"
-      },
-      "dependencies": {
-        "@octokit/types": {
-          "version": "6.31.3",
-          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-          "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-          "dev": true,
-          "requires": {
-            "@octokit/openapi-types": "^10.6.4"
-          }
-        },
-        "universal-user-agent": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-          "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-          "dev": true
-        }
       }
     },
     "@octokit/openapi-types": {
-      "version": "10.6.4",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.6.4.tgz",
-      "integrity": "sha512-JVmwWzYTIs6jACYOwD6zu5rdrqGIYsiAsLzTCxdrWIPNKNVjEF6vPTL20shmgJ4qZsq7WPBcLXLsaQD+NLChfg==",
+      "version": "12.8.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.8.0.tgz",
+      "integrity": "sha512-ydcKLs2KKcxlhpdWLzJxEBDEk/U5MUeqtqkXlrtAUXXFPs6vLl1PEGghFC/BbpleosB7iXs0Z4P2DGe7ZT5ZNg==",
       "dev": true
     },
     "@octokit/plugin-paginate-rest": {
@@ -24497,17 +24349,6 @@
       "dev": true,
       "requires": {
         "@octokit/types": "^6.31.3"
-      },
-      "dependencies": {
-        "@octokit/types": {
-          "version": "6.31.3",
-          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-          "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-          "dev": true,
-          "requires": {
-            "@octokit/openapi-types": "^10.6.4"
-          }
-        }
       }
     },
     "@octokit/plugin-request-log": {
@@ -24539,34 +24380,17 @@
       }
     },
     "@octokit/request": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz",
-      "integrity": "sha512-je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
+      "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
       "dev": true,
       "requires": {
         "@octokit/endpoint": "^6.0.1",
         "@octokit/request-error": "^2.1.0",
         "@octokit/types": "^6.16.1",
         "is-plain-object": "^5.0.0",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.7",
         "universal-user-agent": "^6.0.0"
-      },
-      "dependencies": {
-        "@octokit/types": {
-          "version": "6.31.3",
-          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-          "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-          "dev": true,
-          "requires": {
-            "@octokit/openapi-types": "^10.6.4"
-          }
-        },
-        "universal-user-agent": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-          "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-          "dev": true
-        }
       }
     },
     "@octokit/request-error": {
@@ -24578,17 +24402,6 @@
         "@octokit/types": "^6.0.3",
         "deprecation": "^2.0.0",
         "once": "^1.4.0"
-      },
-      "dependencies": {
-        "@octokit/types": {
-          "version": "6.31.3",
-          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.3.tgz",
-          "integrity": "sha512-IUG3uMpsLHrtEL6sCVXbxCgnbKcgpkS4K7gVEytLDvYYalkK3XcuMCHK1YPD8xJglSJAOAbL4MgXp47rS9G49w==",
-          "dev": true,
-          "requires": {
-            "@octokit/openapi-types": "^10.6.4"
-          }
-        }
       }
     },
     "@octokit/rest": {
@@ -24601,15 +24414,49 @@
         "@octokit/plugin-paginate-rest": "^2.2.0",
         "@octokit/plugin-request-log": "^1.0.0",
         "@octokit/plugin-rest-endpoint-methods": "3.17.0"
+      },
+      "dependencies": {
+        "@octokit/core": {
+          "version": "2.5.4",
+          "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.4.tgz",
+          "integrity": "sha512-HCp8yKQfTITYK+Nd09MHzAlP1v3Ii/oCohv0/TW9rhSLvzb98BOVs2QmVYuloE6a3l6LsfyGIwb6Pc4ycgWlIQ==",
+          "dev": true,
+          "requires": {
+            "@octokit/auth-token": "^2.4.0",
+            "@octokit/graphql": "^4.3.1",
+            "@octokit/request": "^5.4.0",
+            "@octokit/types": "^5.0.0",
+            "before-after-hook": "^2.1.0",
+            "universal-user-agent": "^5.0.0"
+          }
+        },
+        "@octokit/types": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz",
+          "integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==",
+          "dev": true,
+          "requires": {
+            "@types/node": ">= 8"
+          }
+        },
+        "universal-user-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
+          "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
+          "dev": true,
+          "requires": {
+            "os-name": "^3.1.0"
+          }
+        }
       }
     },
     "@octokit/types": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.5.0.tgz",
-      "integrity": "sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==",
+      "version": "6.39.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.39.0.tgz",
+      "integrity": "sha512-Mq4N9sOAYCitTsBtDdRVrBE80lIrMBhL9Jbrw0d+j96BAzlq4V+GLHFJbHokEsVvO/9tQupQdoFdgVYhD2C8UQ==",
       "dev": true,
       "requires": {
-        "@types/node": ">= 8"
+        "@octokit/openapi-types": "^12.7.0"
       }
     },
     "@prettier/plugin-php": {
@@ -28499,9 +28346,9 @@
       }
     },
     "node-fetch": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz",
-      "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dev": true,
       "requires": {
         "whatwg-url": "^5.0.0"
@@ -32854,27 +32701,6 @@
         "yargs": "^16.2.0"
       },
       "dependencies": {
-        "@octokit/core": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz",
-          "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==",
-          "dev": true,
-          "requires": {
-            "@octokit/auth-token": "^2.4.4",
-            "@octokit/graphql": "^4.5.8",
-            "@octokit/request": "^5.6.3",
-            "@octokit/request-error": "^2.0.5",
-            "@octokit/types": "^6.0.3",
-            "before-after-hook": "^2.2.0",
-            "universal-user-agent": "^6.0.0"
-          }
-        },
-        "@octokit/openapi-types": {
-          "version": "11.2.0",
-          "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-11.2.0.tgz",
-          "integrity": "sha512-PBsVO+15KSlGmiI8QAzaqvsNlZlrDlyAJYcrXBCvVUxCp7VnXjkwPoFHgjEJXx3WF9BAwkA6nfCUA7i9sODzKA==",
-          "dev": true
-        },
         "@octokit/plugin-paginate-rest": {
           "version": "2.17.0",
           "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.17.0.tgz",
@@ -32894,20 +32720,6 @@
             "deprecation": "^2.3.1"
           }
         },
-        "@octokit/request": {
-          "version": "5.6.3",
-          "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz",
-          "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==",
-          "dev": true,
-          "requires": {
-            "@octokit/endpoint": "^6.0.1",
-            "@octokit/request-error": "^2.1.0",
-            "@octokit/types": "^6.16.1",
-            "is-plain-object": "^5.0.0",
-            "node-fetch": "^2.6.7",
-            "universal-user-agent": "^6.0.0"
-          }
-        },
         "@octokit/rest": {
           "version": "18.12.0",
           "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz",
@@ -32920,15 +32732,6 @@
             "@octokit/plugin-rest-endpoint-methods": "^5.12.0"
           }
         },
-        "@octokit/types": {
-          "version": "6.34.0",
-          "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.34.0.tgz",
-          "integrity": "sha512-s1zLBjWhdEI2zwaoSgyOFoKSl109CUcVBCc7biPJ3aAf6LGLU6szDvi31JPU7bxfla2lqfhjbbg/5DdFNxOwHw==",
-          "dev": true,
-          "requires": {
-            "@octokit/openapi-types": "^11.2.0"
-          }
-        },
         "@semantic-release/commit-analyzer": {
           "version": "9.0.2",
           "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-9.0.2.tgz",
@@ -33109,15 +32912,6 @@
           "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
           "dev": true
         },
-        "node-fetch": {
-          "version": "2.6.7",
-          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-          "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-          "dev": true,
-          "requires": {
-            "whatwg-url": "^5.0.0"
-          }
-        },
         "normalize-url": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
@@ -34835,12 +34629,6 @@
           "requires": {
             "lru-cache": "^6.0.0"
           }
-        },
-        "universal-user-agent": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
-          "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
-          "dev": true
         }
       }
     },
@@ -35529,13 +35317,10 @@
       }
     },
     "universal-user-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz",
-      "integrity": "sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==",
-      "dev": true,
-      "requires": {
-        "os-name": "^3.1.0"
-      }
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz",
+      "integrity": "sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==",
+      "dev": true
     },
     "universalify": {
       "version": "2.0.0",
diff --git a/package.json b/package.json
index 89565d85..c396af4d 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,8 @@
     "test:build": "rollup -c test/snapshot/rollup.config.js",
     "test:watch": "rollup -c test/snapshot/rollup.config.js -w",
     "test": "npm run test:snapshot",
-    "open:snapshot": "cypress open --project test/snapshot"
+    "open:snapshot": "cypress open --project test/snapshot",
+    "open:e2e": "cypress open --project test/e2e"
   },
   "release": {
     "extends": "@cablanchard/semantic-release"
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 85b75da3..b57ee84b 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <script src="Idealpostcodes_Ukaddresssearch::binding.min.js"/>
-    </head>
     <body>
         <referenceBlock name="head.additional">
             <block class="Magento\Framework\View\Element\Template" name="idealpostcodes.ukaddresssearch.store" template="Idealpostcodes_Ukaddresssearch::store.phtml" />
diff --git a/view/frontend/templates/store.phtml b/view/frontend/templates/store.phtml
index 0973026e..389c345e 100644
--- a/view/frontend/templates/store.phtml
+++ b/view/frontend/templates/store.phtml
@@ -3,29 +3,41 @@ $helper = $this->helper('Idealpostcodes\Ukaddresssearch\Helper\Data'); ?>
 
 <script type="text/javascript" name="Ideal_Postcodes">
 document.addEventListener('DOMContentLoaded', function() {
-  var apiKey = "<?php echo $helper->getConfig('api_key'); ?>";
-  var postcodeLookup = <?php echo $helper->getConfig('postcodeLookup'); ?>;
-  var autocomplete = <?php echo $helper->getConfig('addressAutocomplete'); ?>;
-  var populateOrganisation = <?php echo $helper->getConfig('populateOrganisation'); ?>;
-  var hoistCountry = <?php echo $helper->getConfig('hoistCountryField'); ?>;
-  var populateCounty = <?php echo $helper->getConfig('requireCounty'); ?>;
-  var autocompleteOverride = <?php echo $helper->getConfig('autocompleteOverride'); ?>;
-  var postcodeLookupOverride = <?php echo $helper->getConfig('postcodeLookupOverride'); ?>;
-  var enabled = <?php echo $helper->getConfig('enabled'); ?>;
-  var customFields = <?php echo trim(preg_replace('/\r|\n/', '', $helper->getConfig('customFields'))); ?>;
-  // Exit early if disabled
-  if (enabled === false) return;
-  window.idpcConfig = {
-    apiKey: apiKey,
-    postcodeLookup: postcodeLookup,
-    autocomplete: autocomplete,
-    populateCounty: populateCounty,
-    populateOrganisation: populateOrganisation,
-    hoistCountry: hoistCountry,
-    autocompleteOverride: autocompleteOverride,
-    postcodeLookupOverride: postcodeLookupOverride,
-    customFields: customFields
-  };
-  window.idpcStart();
+   var url = window.location.href;
+   var onlyOnCheckout = <?php echo $helper->getConfig('checkoutOnly'); ?>;
+   var urlRegex = new RegExp("<?php echo $helper->getConfig('matchCheckout'); ?>");
+   var script = document.createElement("script");
+   script.src = "<?php echo $helper->getFileUrl('binding.min.js'); ?>";
+   script.onload = function() {
+        var apiKey = "<?php echo $helper->getConfig('api_key'); ?>";
+        var postcodeLookup = <?php echo $helper->getConfig('postcodeLookup'); ?>;
+        var autocomplete = <?php echo $helper->getConfig('addressAutocomplete'); ?>;
+        var populateOrganisation = <?php echo $helper->getConfig('populateOrganisation'); ?>;
+        var hoistCountry = <?php echo $helper->getConfig('hoistCountryField'); ?>;
+        var populateCounty = <?php echo $helper->getConfig('requireCounty'); ?>;
+        var autocompleteOverride = <?php echo $helper->getConfig('autocompleteOverride'); ?>;
+        var postcodeLookupOverride = <?php echo $helper->getConfig('postcodeLookupOverride'); ?>;
+        var enabled = <?php echo $helper->getConfig('enabled'); ?>;
+        var customFields = <?php echo trim(preg_replace('/\r|\n/', '', $helper->getConfig('customFields'))); ?>;
+        // Exit early if disabled
+        if (enabled === false) return;
+        window.idpcConfig = {
+            apiKey: apiKey,
+            postcodeLookup: postcodeLookup,
+            autocomplete: autocomplete,
+            populateCounty: populateCounty,
+            populateOrganisation: populateOrganisation,
+            hoistCountry: hoistCountry,
+            autocompleteOverride: autocompleteOverride,
+            postcodeLookupOverride: postcodeLookupOverride,
+            customFields: customFields
+        };
+        window.idpcStart();
+   }
+   if(!onlyOnCheckout) {
+		document.head.appendChild(script);
+   } else if(urlRegex.test(url)) {
+   		document.head.appendChild(script);
+   }
 });
 </script>