diff --git a/magnum/drivers/k8s_coreos_v1/template_def.py b/magnum/drivers/k8s_coreos_v1/template_def.py
index d381112463..df2998d5d5 100644
--- a/magnum/drivers/k8s_coreos_v1/template_def.py
+++ b/magnum/drivers/k8s_coreos_v1/template_def.py
@@ -129,9 +129,9 @@ class CoreOSK8sTemplateDefinition(K8sTemplateDefinition):
 
     def get_env_files(self, baymodel):
         if baymodel.master_lb_enabled:
-            return ['common/environments/with_master_lb.yaml']
+            return ['../../common/templates/environments/with_master_lb.yaml']
         else:
-            return ['common/environments/no_master_lb.yaml']
+            return ['../../common/templates/environments/no_master_lb.yaml']
 
     @property
     def template_path(self):
diff --git a/magnum/drivers/k8s_coreos_v1/templates/common b/magnum/drivers/k8s_coreos_v1/templates/common
deleted file mode 120000
index 03eb261d79..0000000000
--- a/magnum/drivers/k8s_coreos_v1/templates/common
+++ /dev/null
@@ -1 +0,0 @@
-../../common/templates
\ No newline at end of file
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/template_def.py b/magnum/drivers/k8s_fedora_atomic_v1/template_def.py
index f8978ce12a..634a7af5a4 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/template_def.py
+++ b/magnum/drivers/k8s_fedora_atomic_v1/template_def.py
@@ -153,9 +153,9 @@ class AtomicK8sTemplateDefinition(K8sTemplateDefinition):
 
     def get_env_files(self, baymodel):
         if baymodel.master_lb_enabled:
-            return ['common/environments/with_master_lb.yaml']
+            return ['../../common/templates/environments/with_master_lb.yaml']
         else:
-            return ['common/environments/no_master_lb.yaml']
+            return ['../../common/templates/environments/no_master_lb.yaml']
 
     @property
     def template_path(self):
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/common b/magnum/drivers/k8s_fedora_atomic_v1/templates/common
deleted file mode 120000
index 03eb261d79..0000000000
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/common
+++ /dev/null
@@ -1 +0,0 @@
-../../common/templates
\ No newline at end of file
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
index 6f64f96220..eba16d4f39 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
@@ -268,7 +268,7 @@ resources:
       config:
         str_replace:
           params:
-            $configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
+            $configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
           template: {get_file: fragments/configure-docker-storage.sh}
 
   configure_etcd:
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
index 8494c147ee..f2660fb743 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
@@ -275,14 +275,14 @@ resources:
       config:
         str_replace:
           params:
-            $configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
+            $configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
           template: {get_file: fragments/configure-docker-storage.sh}
 
   configure_docker_registry:
     type: OS::Heat::SoftwareConfig
     properties:
       group: ungrouped
-      config: {get_file: common/fragments/configure-docker-registry.sh}
+      config: {get_file: ../../common/templates/fragments/configure-docker-registry.sh}
 
   configure_kubernetes_minion:
     type: OS::Heat::SoftwareConfig
diff --git a/magnum/drivers/mesos_ubuntu_v1/template_def.py b/magnum/drivers/mesos_ubuntu_v1/template_def.py
index 6c3852095e..d571cfd519 100644
--- a/magnum/drivers/mesos_ubuntu_v1/template_def.py
+++ b/magnum/drivers/mesos_ubuntu_v1/template_def.py
@@ -83,9 +83,9 @@ class UbuntuMesosTemplateDefinition(template_def.BaseTemplateDefinition):
 
     def get_env_files(self, baymodel):
         if baymodel.master_lb_enabled:
-            return ['common/environments/with_master_lb.yaml']
+            return ['../../common/templates/environments/with_master_lb.yaml']
         else:
-            return ['common/environments/no_master_lb.yaml']
+            return ['../../common/templates/environments/no_master_lb.yaml']
 
     @property
     def template_path(self):
diff --git a/magnum/drivers/mesos_ubuntu_v1/templates/common b/magnum/drivers/mesos_ubuntu_v1/templates/common
deleted file mode 120000
index 03eb261d79..0000000000
--- a/magnum/drivers/mesos_ubuntu_v1/templates/common
+++ /dev/null
@@ -1 +0,0 @@
-../../common/templates
\ No newline at end of file
diff --git a/magnum/drivers/swarm_fedora_atomic_v1/template_def.py b/magnum/drivers/swarm_fedora_atomic_v1/template_def.py
index f707dd3e5d..bea785d2f2 100644
--- a/magnum/drivers/swarm_fedora_atomic_v1/template_def.py
+++ b/magnum/drivers/swarm_fedora_atomic_v1/template_def.py
@@ -112,9 +112,9 @@ class AtomicSwarmTemplateDefinition(template_def.BaseTemplateDefinition):
 
     def get_env_files(self, baymodel):
         if baymodel.master_lb_enabled:
-            return ['common/environments/with_master_lb.yaml']
+            return ['../../common/templates/environments/with_master_lb.yaml']
         else:
-            return ['common/environments/no_master_lb.yaml']
+            return ['../../common/templates/environments/no_master_lb.yaml']
 
     @property
     def template_path(self):
diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/common b/magnum/drivers/swarm_fedora_atomic_v1/templates/common
deleted file mode 120000
index 03eb261d79..0000000000
--- a/magnum/drivers/swarm_fedora_atomic_v1/templates/common
+++ /dev/null
@@ -1 +0,0 @@
-../../common/templates
\ No newline at end of file
diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
index 2722b0796b..7e68b05a8f 100644
--- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
+++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
@@ -251,7 +251,7 @@ resources:
       config:
         str_replace:
           params:
-            $configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
+            $configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
           template: {get_file: fragments/configure-docker-storage.sh}
 
   make_cert:
diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
index 02b3a0edea..20983c086e 100644
--- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
+++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
@@ -222,14 +222,14 @@ resources:
       config:
         str_replace:
           params:
-            $configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
+            $configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
           template: {get_file: fragments/configure-docker-storage.sh}
 
   configure_docker_registry:
     type: OS::Heat::SoftwareConfig
     properties:
       group: ungrouped
-      config: {get_file: common/fragments/configure-docker-registry.sh}
+      config: {get_file: ../../common/templates/fragments/configure-docker-registry.sh}
 
   write_docker_service:
     type: "OS::Heat::SoftwareConfig"
diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
index f51c92f9e9..34a80f288d 100644
--- a/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
@@ -178,7 +178,7 @@ class TestBayConductorWithK8s(base.TestCase):
 
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('requests.get')
@@ -246,7 +246,7 @@ class TestBayConductorWithK8s(base.TestCase):
 
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('requests.get')
@@ -302,7 +302,7 @@ class TestBayConductorWithK8s(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('requests.get')
@@ -356,7 +356,7 @@ class TestBayConductorWithK8s(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('requests.get')
@@ -518,7 +518,7 @@ class TestBayConductorWithK8s(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
         reqget.assert_called_once_with('http://etcd/test?size=1')
 
diff --git a/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
index 9160d1ab9f..b990470a16 100644
--- a/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
@@ -122,7 +122,7 @@ class TestBayConductorWithMesos(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('magnum.objects.BayModel.get_by_uuid')
@@ -168,7 +168,7 @@ class TestBayConductorWithMesos(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('magnum.objects.BayModel.get_by_uuid')
@@ -217,7 +217,7 @@ class TestBayConductorWithMesos(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/with_master_lb.yaml'],
+            ['../../common/templates/environments/with_master_lb.yaml'],
             env_files)
 
     @patch('magnum.objects.BayModel.get_by_uuid')
@@ -267,7 +267,7 @@ class TestBayConductorWithMesos(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/with_master_lb.yaml'],
+            ['../../common/templates/environments/with_master_lb.yaml'],
             env_files)
 
     @patch('magnum.conductor.utils.retrieve_baymodel')
diff --git a/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
index c12bba01a4..668e19ec1c 100644
--- a/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
+++ b/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
@@ -128,7 +128,7 @@ class TestBayConductorWithSwarm(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('requests.get')
@@ -190,7 +190,7 @@ class TestBayConductorWithSwarm(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('requests.get')
@@ -244,7 +244,7 @@ class TestBayConductorWithSwarm(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/no_master_lb.yaml'],
+            ['../../common/templates/environments/no_master_lb.yaml'],
             env_files)
 
     @patch('requests.get')
@@ -300,7 +300,7 @@ class TestBayConductorWithSwarm(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/with_master_lb.yaml'],
+            ['../../common/templates/environments/with_master_lb.yaml'],
             env_files)
 
     @patch('requests.get')
@@ -357,7 +357,7 @@ class TestBayConductorWithSwarm(base.TestCase):
         }
         self.assertEqual(expected, definition)
         self.assertEqual(
-            ['common/environments/with_master_lb.yaml'],
+            ['../../common/templates/environments/with_master_lb.yaml'],
             env_files)
 
     @patch('magnum.conductor.utils.retrieve_baymodel')