diff --git a/unit_tests/test_zaza_charm_lifecycle_deploy.py b/unit_tests/test_zaza_charm_lifecycle_deploy.py
index 61688c2..02f55b9 100644
--- a/unit_tests/test_zaza_charm_lifecycle_deploy.py
+++ b/unit_tests/test_zaza_charm_lifecycle_deploy.py
@@ -9,6 +9,11 @@ class TestCharmLifecycleDeploy(ut_utils.BaseTestCase):
 
     def test_is_valid_env_key(self):
         self.assertTrue(lc_deploy.is_valid_env_key('OS_VIP04'))
+        self.assertTrue(lc_deploy.is_valid_env_key('FIP_RANGE'))
+        self.assertTrue(lc_deploy.is_valid_env_key('GATEWAY'))
+        self.assertTrue(lc_deploy.is_valid_env_key('NAME_SERVER'))
+        self.assertTrue(lc_deploy.is_valid_env_key('NET_ID'))
+        self.assertTrue(lc_deploy.is_valid_env_key('VIP_RANGE'))
         self.assertFalse(lc_deploy.is_valid_env_key('AMULET_OS_VIP'))
         self.assertFalse(lc_deploy.is_valid_env_key('ZAZA_TEMPLATE_VIP00'))
         self.assertFalse(lc_deploy.is_valid_env_key('PATH'))
diff --git a/zaza/charm_lifecycle/deploy.py b/zaza/charm_lifecycle/deploy.py
index 547cf70..679589c 100755
--- a/zaza/charm_lifecycle/deploy.py
+++ b/zaza/charm_lifecycle/deploy.py
@@ -12,7 +12,14 @@ import zaza.charm_lifecycle.utils as utils
 
 DEFAULT_OVERLAY_TEMPLATE_DIR = 'tests/bundles/overlays'
 DEFAULT_OVERLAYS = ['local-charm-overlay.yaml']
-VALID_ENVIRONMENT_KEY_PREFIXES = ['OS_']
+VALID_ENVIRONMENT_KEY_PREFIXES = [
+    'FIP_RANGE',
+    'GATEWAY',
+    'NAME_SERVER',
+    'NET_ID',
+    'OS_',
+    'VIP_RANGE',
+]
 
 
 def is_valid_env_key(key):