diff --git a/ranger_tempest_plugin/clients.py b/ranger_tempest_plugin/clients.py
index dfd474f..8fe7fb1 100755
--- a/ranger_tempest_plugin/clients.py
+++ b/ranger_tempest_plugin/clients.py
@@ -33,19 +33,19 @@ class OrmClientManager(clients.Manager):
             base_client.RangerAuthProvider(credentials),
             CONF.identity.catalog_type,
             CONF.identity.region,
-            CONF.ranger.RANGER_CMS_BASE_URL)
+            CONF.ranger.ranger_cms_base_url)
         self.fms_client = FmsClient(
             base_client.RangerAuthProvider(credentials),
             CONF.identity.catalog_type,
             CONF.identity.region,
-            CONF.ranger.RANGER_FMS_BASE_URL)
+            CONF.ranger.ranger_fms_base_url)
         self.rms_client = RmsClient(
             base_client.RangerAuthProvider(credentials),
             CONF.identity.catalog_type,
             CONF.identity.region,
-            CONF.ranger.RANGER_RMS_BASE_URL)
+            CONF.ranger.ranger_rms_base_url)
         self.ims_client = ImsClient(
             base_client.RangerAuthProvider(credentials),
             CONF.identity.catalog_type,
             CONF.identity.region,
-            CONF.ranger.RANGER_IMS_BASE_URL)
+            CONF.ranger.ranger_ims_base_url)
diff --git a/ranger_tempest_plugin/config.py b/ranger_tempest_plugin/config.py
index 70f89c6..0da86c8 100755
--- a/ranger_tempest_plugin/config.py
+++ b/ranger_tempest_plugin/config.py
@@ -32,33 +32,15 @@ ORM_GROUP = cfg.OptGroup(
 )
 
 ORM_GROUP_OPTIONS = [
-    cfg.StrOpt("uri",
-               default="orm",
-               help="Uri of the orm service."),
-    cfg.StrOpt("cms_port",
-               default='7080',
-               help="cms port of the orm url."),
-    cfg.StrOpt("fms_port",
-               default='8082',
-               help="fms port of the orm url."),
-    cfg.StrOpt("region_port",
-               default='8080',
-               help="region port of the orm url."),
-    cfg.BoolOpt("alt_region_available",
-                default=None,
-                help="alt_region_available of the orm alternate region."),
-    cfg.StrOpt("ims_port",
-               default='8084',
-               help="ims port of the orm url."),
     cfg.StrOpt("image_url",
                help="swift container url where image is located"),
-    cfg.StrOpt("RANGER_CMS_BASE_URL",
+    cfg.StrOpt("ranger_cms_base_url",
                help="Ranger Project Service URL"),
-    cfg.StrOpt("RANGER_FMS_BASE_URL",
+    cfg.StrOpt("ranger_fms_base_url",
                help="Ranger Flavor Service URL"),
-    cfg.StrOpt("RANGER_IMS_BASE_URL",
+    cfg.StrOpt("ranger_ims_base_url",
                help="Ranger Image Service URL"),
-    cfg.StrOpt("RANGER_RMS_BASE_URL",
+    cfg.StrOpt("ranger_rms_base_url",
                help="Ranger Region Service URL"),
     cfg.BoolOpt('verify',
                 default=False,
@@ -69,6 +51,9 @@ ORM_GROUP_OPTIONS = [
     cfg.ListOpt("flavor_series",
                 default=['xx'],
                 help="Supported flavor series"),
+    cfg.StrOpt("catalog_type",
+               default='ranger',
+               help="ranger catalog type"),
     cfg.StrOpt("domain",
                default='Default',
                help="Domain used for Ranger tempest testing"),
diff --git a/ranger_tempest_plugin/services/base_client.py b/ranger_tempest_plugin/services/base_client.py
index c8189ef..210f678 100755
--- a/ranger_tempest_plugin/services/base_client.py
+++ b/ranger_tempest_plugin/services/base_client.py
@@ -34,7 +34,7 @@ class ConnectionError(Exception):
 
 class RangerClientBase(rest_client.RestClient):
 
-    rms_url = CONF.ranger.RANGER_RMS_BASE_URL
+    rms_url = CONF.ranger.ranger_rms_base_url
     auth_region = CONF.identity.region
 
     timeout = 10
diff --git a/ranger_tempest_plugin/services/cms_client.py b/ranger_tempest_plugin/services/cms_client.py
index 17f2256..00031da 100755
--- a/ranger_tempest_plugin/services/cms_client.py
+++ b/ranger_tempest_plugin/services/cms_client.py
@@ -26,7 +26,7 @@ CONF = config.CONF
 
 class CmsClient(base_client.RangerClientBase):
 
-    cms_url = CONF.ranger.RANGER_CMS_BASE_URL
+    cms_url = CONF.ranger.ranger_cms_base_url
     version = 'v1'
 
     # POST
diff --git a/ranger_tempest_plugin/services/fms_client.py b/ranger_tempest_plugin/services/fms_client.py
index accd375..149105d 100755
--- a/ranger_tempest_plugin/services/fms_client.py
+++ b/ranger_tempest_plugin/services/fms_client.py
@@ -26,7 +26,7 @@ CONF = config.CONF
 
 class FmsClient(base_client.RangerClientBase):
 
-    fms_url = CONF.ranger.RANGER_FMS_BASE_URL
+    fms_url = CONF.ranger.ranger_fms_base_url
     version = "v1"
 
     def create_flavor(self, **kwargs):
diff --git a/ranger_tempest_plugin/services/grp_client.py b/ranger_tempest_plugin/services/grp_client.py
index f57912f..3c8540c 100755
--- a/ranger_tempest_plugin/services/grp_client.py
+++ b/ranger_tempest_plugin/services/grp_client.py
@@ -29,7 +29,7 @@ CONF = config.CONF
 
 class GrpClient(base_client.RangerClientBase):
 
-    cms_url = CONF.ranger.RANGER_CMS_BASE_URL
+    cms_url = CONF.ranger.ranger_cms_base_url
     version = 'v1'
 
     def create_group(self, **kwargs):
diff --git a/ranger_tempest_plugin/services/ims_client.py b/ranger_tempest_plugin/services/ims_client.py
index 65b1ed3..2093271 100755
--- a/ranger_tempest_plugin/services/ims_client.py
+++ b/ranger_tempest_plugin/services/ims_client.py
@@ -24,7 +24,7 @@ CONF = config.CONF
 
 class ImsClient(base_client.RangerClientBase):
 
-    ims_url = CONF.ranger.RANGER_IMS_BASE_URL
+    ims_url = CONF.ranger.ranger_ims_base_url
     version = "v1"
 
     def create_image(self, **kwargs):
diff --git a/ranger_tempest_plugin/services/rms_client.py b/ranger_tempest_plugin/services/rms_client.py
index a5abb98..bde727b 100755
--- a/ranger_tempest_plugin/services/rms_client.py
+++ b/ranger_tempest_plugin/services/rms_client.py
@@ -27,7 +27,7 @@ CONF = config.CONF
 
 class RmsClient(base_client.RangerClientBase):
 
-    rms_url = CONF.ranger.RANGER_RMS_BASE_URL
+    rms_url = CONF.ranger.ranger_rms_base_url
     identity_url = CONF.identity.uri_v3 or ""
     identity_url = identity_url.strip('/v3')
     version = "v2"