diff --git a/config/.meepctl-repocfg.yaml b/config/.meepctl-repocfg.yaml
index cf535cb1061e326579dae608d5a80daf8a87084a..e50dad76534b154d605ea11f2b070593f353e1d1 100644
--- a/config/.meepctl-repocfg.yaml
+++ b/config/.meepctl-repocfg.yaml
@@ -308,7 +308,7 @@ repo:
           # - meep-tc-engine
           # - meep-app-enablement
           # - meep-vis
-          - meep-federation
+          # - meep-federation
         # location of API specifications
         api:
           - name: 'AdvantEDGE Monitoring Engine REST API'
@@ -439,7 +439,7 @@ repo:
           # - meep-tc-engine
           # - meep-app-enablement
           # - meep-vis
-          - meep-federation
+          # - meep-federation
       meep-webhook:
         # location of source code
         src: go-apps/meep-webhook
@@ -966,6 +966,8 @@ repo:
             file: go-apps/meep-federation/api/swagger.yaml
         # location of user supplied API specifications
         user-api:
+          - name: 'Federation Service REST API'
+            file: config/api/fed-api.yaml
         # resources available to docker container image
         docker-data:
           # location of entry script
diff --git a/js-apps/frontend/src/js/containers/app-container.js b/js-apps/frontend/src/js/containers/app-container.js
index eeea90e8a3099e8e11264835be2ffe1b138948f0..ac387e5d4194fd9bf81d9bd77ae59fdafa277434 100644
--- a/js-apps/frontend/src/js/containers/app-container.js
+++ b/js-apps/frontend/src/js/containers/app-container.js
@@ -120,7 +120,7 @@ const apiTableMaxSize = 100;
 var metricsQuery = {
 /*  tags: [{
     name: 'logger_name',
-    value: 'meep-loc-serv,meep-federation,meep-rnis,meep-dai,meep-wais,meep-app-enablement'
+    value: 'meep-loc-serv,meep-federation,meep-rnis,meep-dai,meep-vis,meep-federation,meep-wais,meep-app-enablement'
   }],
 */
   fields: ['id', 'endpoint', 'url', 'method', 'resp_code', 'resp_body', 'body', 'proc_time', 'logger_name', 'direction'],
diff --git a/js-apps/frontend/src/js/util/scenario-utils.js b/js-apps/frontend/src/js/util/scenario-utils.js
index 73dd1684f67d6615cb42737b6fda2229ef77e629..39abc1ee494ba63ae98b62e593859aa31d5a0bc8 100644
--- a/js-apps/frontend/src/js/util/scenario-utils.js
+++ b/js-apps/frontend/src/js/util/scenario-utils.js
@@ -659,40 +659,23 @@ export function parseEdgeApps(scenario) {
                   disableInProgressCount: -1
                 });
               // MEC040
-            } else if (proc.image.includes('meep-federation')) {
-              // App support
-              edgeApps.push({
-                id: proc.id,
-                name: proc.name,
-                instance: '',
-                img: proc.image,
-                mepName: pl.name,
-                env: proc.environment,
-                url: 'api/?urls.primaryName='+pl.name+'%20-%20MEC%20Federation%20Service%20API',
-                path: pl.name+'/mec_app_support/v2',
-                pseudoName: 'MEC Application Support (011) on ' + pl.name,
-                dropDownName: 'MEC Application Support (011)',
-                enabled: true,  // always running
-                enableInProgressCount: -1,
-                disableInProgressCount: -1
-              });
-              // Service Management
-              edgeApps.push({
-                id: proc.id,
-                name: proc.name+'-service-mgmt',
-                instance: '',
-                img: proc.image,
-                mepName: pl.name,
-                env: proc.environment,
-                url: 'api/?urls.primaryName='+pl.name+'%20-%20MEC%20Service%20Management%20API',
-                path: pl.name+'/fed_enablement/v1',
-                pseudoName: 'MEC Federation (040) on ' + pl.name,
-                dropDownName: 'MEC Federation (011)',
-                enabled: true,  // always running
-                enableInProgressCount: -1,
-                disableInProgressCount: -1
-              });
-            }
+              } else if (proc.image.includes('meep-federation')) {
+                edgeApps.push({
+                  id: proc.id,
+                  name: proc.name,
+                  instance: '',
+                  img: proc.image,
+                  mepName: pl.name,
+                  env: proc.environment,
+                  url: 'api/?urls.primaryName='+pl.name+'%20-%20Federation%20Service%20REST%20API',
+                  path: pl.name+'/fed_enablement/v1',
+                  pseudoName: 'MEC Federation APIs (040) on ' + pl.name,
+                  dropDownName: 'MEC Federation APIs (040)',
+                  enabled: false,
+                  enableInProgressCount: -1,
+                  disableInProgressCount: -1
+                });
+              }
             }
           }
         }