diff --git a/.gitreview b/.gitreview
index 1caaf438..949ea044 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.openstack.org
 port=29418
 project=openstack/charm-openstack-dashboard.git
+
+defaultbranch=stable/18.08
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index 0a509e82..551b73ac 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.08
 destination: hooks/charmhelpers
 include:
     - core
diff --git a/charm-helpers-tests.yaml b/charm-helpers-tests.yaml
index f64f0dde..6d22530a 100644
--- a/charm-helpers-tests.yaml
+++ b/charm-helpers-tests.yaml
@@ -1,4 +1,4 @@
-repo: https://github.com/juju/charm-helpers
+repo: https://github.com/juju/charm-helpers@stable/18.08
 destination: tests/charmhelpers
 include:
     - contrib.amulet
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 79a8448a..f9e04ee9 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -41,7 +41,7 @@ class OpenstackDashboardBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic openstack-dashboard deployment."""
 
     def __init__(self, series, openstack=None, source=None,
-                 stable=False):
+                 stable=True):
         """Deploy the entire test environment."""
         super(OpenstackDashboardBasicDeployment, self).__init__(series,
                                                                 openstack,