diff --git a/src/config.yaml b/src/config.yaml
index a985d46..3a8ec60 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1 +1,15 @@
-options: {}
+options:
+  nagios_context:
+    default: "juju"
+    type: string
+    description: |
+      A string that will be prepended to instance name to set the host name
+      in nagios. So for instance the hostname would be something like:
+          juju-myservice-0
+      If you're running multiple environments with the same services in them
+      this allows you to differentiate between them.
+  nagios_servicegroups:
+    default: ""
+    type: string
+    description: |
+      Comma separated list of nagios servicegroups for the service checks.
diff --git a/src/layer.yaml b/src/layer.yaml
index d58dc30..987b960 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -1,6 +1,7 @@
 includes:
   - layer:ovn
   - interface:ovsdb
+  - interface:nrpe-external-master
 options:
   basic:
     use_venv: True
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 94c2020..af94e8a 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -16,3 +16,7 @@ extra-bindings:
 requires:
   ovsdb:
     interface: ovsdb
+provides:
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
index 7f5b723..f28a657 100644
--- a/src/tests/bundles/bionic-train.yaml
+++ b/src/tests/bundles/bionic-train.yaml
@@ -8,6 +8,8 @@ relations:
   - ovn-central:ovsdb
 - - ovn-dedicated-chassis:certificates
   - vault:certificates
+- - ovn-dedicated-chassis:nrpe-external-master
+  - nrpe:nrpe-external-master
 applications:
   mysql:
     charm: cs:~openstack-charmers-next/percona-cluster
@@ -21,7 +23,9 @@ applications:
     options:
       source: cloud:bionic-train
   ovn-dedicated-chassis:
-    charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
+    charm: ../../../ovn-dedicated-chassis
     num_units: 2
     options:
       source: cloud:bionic-train
+  nrpe:
+    charm: cs:nrpe
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
index 20ce0cb..e0a4855 100644
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -8,6 +8,8 @@ relations:
   - ovn-central:ovsdb
 - - ovn-dedicated-chassis:certificates
   - vault:certificates
+- - ovn-dedicated-chassis:nrpe-external-master
+  - nrpe:nrpe-external-master
 applications:
   mysql:
     charm: cs:~openstack-charmers-next/percona-cluster
@@ -21,7 +23,9 @@ applications:
     options:
       source: cloud:bionic-ussuri/proposed
   ovn-dedicated-chassis:
-    charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
+    charm: ../../../ovn-dedicated-chassis
     num_units: 2
     options:
       source: cloud:bionic-ussuri
+  nrpe:
+    charm: cs:nrpe
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
index a9466c3..83f8128 100644
--- a/src/tests/bundles/focal-ussuri.yaml
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -40,6 +40,9 @@ applications:
     to:
       - '3'
 
+  nrpe:
+    charm: cs:nrpe
+
   ovn-central:
     charm: cs:~openstack-charmers-next/ovn-central
     num_units: 3
@@ -50,9 +53,8 @@ applications:
       - '5'
       - '6'
 
-
   ovn-dedicated-chassis:
-    charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
+    charm: ../../../ovn-dedicated-chassis
     num_units: 2
     options:
       source: *openstack-origin
@@ -72,3 +74,5 @@ relations:
     - 'ovn-central:ovsdb'
   - - 'ovn-dedicated-chassis:certificates'
     - 'vault:certificates'
+  - - 'ovn-dedicated-chassis:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
index 257e95a..3341176 100644
--- a/src/tests/bundles/focal-victoria.yaml
+++ b/src/tests/bundles/focal-victoria.yaml
@@ -50,6 +50,8 @@ applications:
       - '5'
       - '6'
 
+  nrpe:
+    charm: cs:nrpe
 
   ovn-dedicated-chassis:
     charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
@@ -72,3 +74,5 @@ relations:
     - 'ovn-central:ovsdb'
   - - 'ovn-dedicated-chassis:certificates'
     - 'vault:certificates'
+  - - 'ovn-dedicated-chassis:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml
index 19dcb82..f4a95e8 100644
--- a/src/tests/bundles/groovy-victoria.yaml
+++ b/src/tests/bundles/groovy-victoria.yaml
@@ -39,6 +39,9 @@ applications:
     num_units: 1
     to:
       - '3'
+  
+  nrpe:
+    charm: cs:nrpe
 
   ovn-central:
     charm: cs:~openstack-charmers-next/ovn-central
@@ -50,9 +53,8 @@ applications:
       - '5'
       - '6'
 
-
   ovn-dedicated-chassis:
-    charm: cs:~openstack-charmers-next/ovn-dedicated-chassis
+    charm: ../../../ovn-dedicated-chassis
     num_units: 2
     options:
       source: *openstack-origin
@@ -60,6 +62,7 @@ applications:
       - '7'
       - '8'
 
+
 relations:
 
   - - 'vault-mysql-router:db-router'
@@ -72,3 +75,5 @@ relations:
     - 'ovn-central:ovsdb'
   - - 'ovn-dedicated-chassis:certificates'
     - 'vault:certificates'
+  - - 'ovn-dedicated-chassis:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index cfbcd0d..53a9476 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -18,6 +18,9 @@ target_deploy_status:
   vault:
     workload-status: blocked
     workload-status-message: Vault needs to be initialized
+  nrpe:
+    workload-status: blocked
+    workload-status-message: "Nagios server not configured or related"
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
 tests: