diff --git a/cloudpulse/scenario/plugins/endpoint_tests/endpoint.py b/cloudpulse/scenario/plugins/endpoint_tests/endpoint.py
index f559f34..0cda75e 100644
--- a/cloudpulse/scenario/plugins/endpoint_tests/endpoint.py
+++ b/cloudpulse/scenario/plugins/endpoint_tests/endpoint.py
@@ -44,6 +44,12 @@ TESTS_OPTS = [
                help='Run all endpoint tests in interval')
 ]
 
+POD_TESTS_OPTS = [
+    cfg.StrOpt('podtype',
+               default='',
+               help='Mgmt PODTYPE')
+]
+
 CONF = cfg.CONF
 
 periodic_test_group = cfg.OptGroup(name='periodic_tests',
@@ -51,6 +57,11 @@ periodic_test_group = cfg.OptGroup(name='periodic_tests',
 CONF.register_group(periodic_test_group)
 CONF.register_opts(TESTS_OPTS, periodic_test_group)
 
+pod_type_test_group = cfg.OptGroup(name='pod_type',
+                                   title='Mgmt POD Type')
+CONF.register_group(pod_type_test_group)
+CONF.register_opts(POD_TESTS_OPTS, pod_type_test_group)
+
 
 class endpoint_scenario(base.Scenario):
 
@@ -88,6 +99,10 @@ class endpoint_scenario(base.Scenario):
 
     @base.scenario(admin_only=False, operator=False)
     def cinder_endpoint(self, *args, **kwargs):
+        podtype = cfg.CONF.pod_type.podtype
+        if podtype.lower() == "edge":
+            skip_msg = "cinder_endpoint test not supported for PODTYPE: edge"
+            return (300, skip_msg, [])
         creds = self._get_keystone_session_creds()
         cinder = CinderHealth(creds)
         return cinder.cinder_list()
diff --git a/cloudpulse/scenario/plugins/operator_tests/operator.py b/cloudpulse/scenario/plugins/operator_tests/operator.py
index ea0ee30..2bccb0a 100644
--- a/cloudpulse/scenario/plugins/operator_tests/operator.py
+++ b/cloudpulse/scenario/plugins/operator_tests/operator.py
@@ -277,7 +277,7 @@ class operator_scenario(base.Scenario):
             cmd = (r"ceph -f json status")
             is_containerized = cfg.CONF.operator_test.containerized
             if is_containerized:
-                ceph_container = get_container_name("ceph")
+                ceph_container = get_container_name("cephmon")
                 cmd = ("'docker exec %s %s'" % (ceph_container, cmd))
             anscmd = "ansible -o all  -i 127.0.0.1, -a "
             cmd = anscmd + cmd + ' -u root'