diff --git a/magnum_tempest_plugin/common/datagen.py b/magnum_tempest_plugin/common/datagen.py
index 7d1fe8e..3cf77fd 100644
--- a/magnum_tempest_plugin/common/datagen.py
+++ b/magnum_tempest_plugin/common/datagen.py
@@ -35,7 +35,7 @@ def random_int(min_int=1, max_int=100):
 
 def gen_coe_dep_network_driver(coe):
     allowed_driver_types = {
-        'kubernetes': ['flannel', None],
+        'kubernetes': ['flannel', 'calico', None],
         'swarm': ['docker', 'flannel', None],
         'swarm-mode': ['docker', None],
         'mesos': ['docker', None],
@@ -105,7 +105,7 @@ def baymodel_data(**kwargs):
 
     data = {
         "name": data_utils.rand_name('bay'),
-        "coe": "swarm-mode",
+        "coe": "kubernetes",
         "tls_disabled": False,
         "network_driver": None,
         "volume_driver": None,
@@ -210,8 +210,8 @@ def baymodel_valid_data_with_specific_coe(coe):
                          image_id=config.Config.image_id, coe=coe)
 
 
-def valid_swarm_mode_baymodel(is_public=False):
-    """Generates a valid swarm mode baymodel with valid data
+def valid_kubernetes_baymodel(is_public=False):
+    """Generates a valid kubernetes baymodel with valid data
 
     :returns: BayModelEntity with generated data
     """
@@ -221,7 +221,7 @@ def valid_swarm_mode_baymodel(is_public=False):
                          dns_nameserver=config.Config.dns_nameserver,
                          master_flavor_id=config.Config.master_flavor_id,
                          keypair_id=config.Config.keypair_name,
-                         coe="swarm-mode",
+                         coe="kubernetes",
                          cluster_distro=None,
                          external_network_id=config.Config.nic_id,
                          http_proxy=None, https_proxy=None, no_proxy=None,
@@ -346,7 +346,7 @@ def cluster_template_data(**kwargs):
 
     data = {
         "name": data_utils.rand_name('cluster'),
-        "coe": "swarm-mode",
+        "coe": "kubernetes",
         "tls_disabled": False,
         "network_driver": None,
         "volume_driver": None,
diff --git a/magnum_tempest_plugin/config.py b/magnum_tempest_plugin/config.py
index 6a91a43..8e056ec 100644
--- a/magnum_tempest_plugin/config.py
+++ b/magnum_tempest_plugin/config.py
@@ -31,7 +31,7 @@ MagnumGroup = [
     cfg.StrOpt("docker_storage_driver",
                help="Docker storage driver. Supported: devicemapper, overlay"),
     cfg.StrOpt("image_id",
-               default="fedora-atomic-latest",
+               default="fedora-coreos-latest",
                help="Image id to be used for ClusterTemplate."),
     cfg.StrOpt("nic_id",
                default="public",
@@ -41,12 +41,12 @@ MagnumGroup = [
                help="Keypair name to use to log into nova instances, the "
                     "keypair is created automatically if not exist."),
     cfg.StrOpt("flavor_id",
-               default="s1.magnum",
+               default="ds2G",
                help="Flavor id to use for ClusterTemplate."),
     cfg.StrOpt("magnum_url",
                help="Bypass URL for Magnum to skip service catalog lookup"),
     cfg.StrOpt("master_flavor_id",
-               default="m1.magnum",
+               default="ds2G",
                help="Master flavor id to use for ClusterTemplate."),
     cfg.StrOpt("csr_location",
                default="/opt/stack/new/magnum/default.csr",
@@ -60,7 +60,7 @@ MagnumGroup = [
                 default=True,
                 help="Specify whether to copy nova server logs on failure."),
     cfg.StrOpt("coe",
-               default="swarm-mode",
+               default="kubernetes",
                help="Container Orchestration Engine"),
     cfg.StrOpt("network_driver",
                help="Network Driver"),
diff --git a/magnum_tempest_plugin/tests/api/v1/test_bay.py b/magnum_tempest_plugin/tests/api/v1/test_bay.py
index 6dc9acb..e8ffa97 100755
--- a/magnum_tempest_plugin/tests/api/v1/test_bay.py
+++ b/magnum_tempest_plugin/tests/api/v1/test_bay.py
@@ -58,7 +58,7 @@ class BayTest(base.BaseTempestTest):
                 creds=self.creds,
                 type_of_creds='default',
                 request_type='cert')
-            model = datagen.valid_swarm_mode_baymodel()
+            model = datagen.valid_kubernetes_baymodel()
             _, self.baymodel = self._create_baymodel(model)
 
             # NOTE (dimtruck) by default tempest sets timeout to 20 mins.
diff --git a/magnum_tempest_plugin/tests/api/v1/test_baymodel.py b/magnum_tempest_plugin/tests/api/v1/test_baymodel.py
index c48dff6..0325784 100644
--- a/magnum_tempest_plugin/tests/api/v1/test_baymodel.py
+++ b/magnum_tempest_plugin/tests/api/v1/test_baymodel.py
@@ -74,7 +74,7 @@ class BayModelTest(base.BaseTempestTest):
 
     @testtools.testcase.attr('positive')
     def test_create_get_public_baymodel(self):
-        gen_model = datagen.valid_swarm_mode_baymodel(is_public=True)
+        gen_model = datagen.valid_kubernetes_baymodel(is_public=True)
         self.assertRaises(
             exceptions.Forbidden,
             self.baymodel_client.post_baymodel, gen_model)
diff --git a/magnum_tempest_plugin/tests/api/v1/test_baymodel_admin.py b/magnum_tempest_plugin/tests/api/v1/test_baymodel_admin.py
index 9b76286..1432ba1 100644
--- a/magnum_tempest_plugin/tests/api/v1/test_baymodel_admin.py
+++ b/magnum_tempest_plugin/tests/api/v1/test_baymodel_admin.py
@@ -57,7 +57,7 @@ class BayModelAdminTest(base.BaseTempestTest):
 
     @testtools.testcase.attr('positive')
     def test_create_get_public_baymodel(self):
-        gen_model = datagen.valid_swarm_mode_baymodel(is_public=True)
+        gen_model = datagen.valid_kubernetes_baymodel(is_public=True)
         resp, model = self._create_baymodel(gen_model)
 
         resp, model = self.baymodel_client.get_baymodel(model.uuid)