diff --git a/.gitreview b/.gitreview
index bbc039e1..24c8f6e1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.openstack.org
 port=29418
 project=openstack/charm-nova-cloud-controller.git
+
+defaultbranch=stable/18.11
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index 3fdc3313..4ad5cfde 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,4 +1,4 @@
-repo: https://github.com/juju/charm-helpers
+repo: https://github.com/juju/charm-helpers@stable/18.11
 destination: charmhelpers
 include:
     - core
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 40f0d9ee..40c7a7ba 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -56,7 +56,7 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic nova cloud controller deployment."""
 
     def __init__(self, series=None, openstack=None, source=None,
-                 stable=False):
+                 stable=True):
         """Deploy the entire test environment."""
         super(NovaCCBasicDeployment, self).__init__(series, openstack,
                                                     source, stable)