diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py
index b7f39ecb0..2f3580571 100644
--- a/python/vyos/defaults.py
+++ b/python/vyos/defaults.py
@@ -1,64 +1,58 @@
 # Copyright 2018-2023 VyOS maintainers and contributors <maintainers@vyos.io>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 
 base_dir = '/usr/libexec/vyos/'
 
 directories = {
   'base' : base_dir,
   'data' : '/usr/share/vyos/',
   'conf_mode' : f'{base_dir}/conf_mode',
   'op_mode' : f'{base_dir}/op_mode',
   'services' : f'{base_dir}/services',
   'config' : '/opt/vyatta/etc/config',
   'migrate' : '/opt/vyatta/etc/config-migrate/migrate',
   'log' : '/var/log/vyatta',
   'templates' : '/usr/share/vyos/templates/',
   'certbot' : '/config/auth/letsencrypt',
   'api_schema': f'{base_dir}/services/api/graphql/graphql/schema/',
   'api_client_op': f'{base_dir}/services/api/graphql/graphql/client_op/',
   'api_templates': f'{base_dir}/services/api/graphql/session/templates/',
   'vyos_udev_dir' : '/run/udev/vyos',
   'isc_dhclient_dir' : '/run/dhclient',
   'dhcp6_client_dir' : '/run/dhcp6c',
 }
 
 config_status = '/tmp/vyos-config-status'
 
 cfg_group = 'vyattacfg'
 
 cfg_vintage = 'vyos'
 
 commit_lock = '/opt/vyatta/config/.lock'
 
 component_version_json = os.path.join(directories['data'], 'component-versions.json')
 
 https_data = {
     'listen_addresses' : { '*': ['_'] }
 }
 
-api_data = {
-    'strict' : False,
-    'debug' : False,
-    'api_keys' : [ {'id' : 'testapp', 'key' : 'qwerty'} ]
-}
-
 vyos_cert_data = {
     'conf' : '/etc/nginx/snippets/vyos-cert.conf',
     'crt' : '/etc/ssl/certs/vyos-selfsigned.crt',
     'key' : '/etc/ssl/private/vyos-selfsign',
     'lifetime' : '365',
 }
diff --git a/src/conf_mode/http-api.py b/src/conf_mode/http-api.py
index d8fe3b736..855d444c6 100755
--- a/src/conf_mode/http-api.py
+++ b/src/conf_mode/http-api.py
@@ -1,154 +1,112 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2019-2021 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 import os
 import json
 
 from time import sleep
-from copy import deepcopy
 
 import vyos.defaults
 
 from vyos.config import Config
 from vyos.configdep import set_dependents, call_dependents
 from vyos.template import render
 from vyos.utils.process import call
 from vyos.utils.process import is_systemd_service_running
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
 
-api_conf_file = '/etc/vyos/http-api.conf'
+api_config_state = '/tmp/api-config-state'
 systemd_service = '/run/systemd/system/vyos-http-api.service'
 
 vyos_conf_scripts_dir=vyos.defaults.directories['conf_mode']
 
-def _translate_values_to_boolean(d: dict) -> dict:
-    for k in list(d):
-        if d[k] == {}:
-            d[k] = True
-        elif isinstance(d[k], dict):
-            _translate_values_to_boolean(d[k])
-        else:
-            pass
-
 def get_config(config=None):
-    http_api = deepcopy(vyos.defaults.api_data)
-    x = http_api.get('api_keys')
-    if x is None:
-        default_key = None
-    else:
-        default_key = x[0]
-    keys_added = False
-
     if config:
         conf = config
     else:
         conf = Config()
 
     # reset on creation/deletion of 'api' node
     https_base = ['service', 'https']
     if conf.exists(https_base):
         set_dependents("https", conf)
 
     base = ['service', 'https', 'api']
     if not conf.exists(base):
         return None
 
-    api_dict = conf.get_config_dict(base, key_mangling=('-', '_'),
+    http_api = conf.get_config_dict(base, key_mangling=('-', '_'),
                                     no_tag_node_value_mangle=True,
                                     get_first_key=True,
                                     with_recursive_defaults=True)
 
-    # One needs to 'flatten' the keys dict from the config into the
-    # http-api.conf format for api_keys:
-    if 'keys' in api_dict:
-        api_dict['api_keys'] = []
-        for el in list(api_dict['keys'].get('id', {})):
-            key = api_dict['keys']['id'][el].get('key', '')
-            if key:
-                api_dict['api_keys'].append({'id': el, 'key': key})
-        del api_dict['keys']
-
     # Do we run inside a VRF context?
     vrf_path = ['service', 'https', 'vrf']
     if conf.exists(vrf_path):
         http_api['vrf'] = conf.return_value(vrf_path)
 
-    if 'api_keys' in api_dict:
-        keys_added = True
-
-    if api_dict.from_defaults(['graphql']):
-        del api_dict['graphql']
-
-    http_api.update(api_dict)
-
-    if keys_added and default_key:
-        if default_key in http_api['api_keys']:
-            http_api['api_keys'].remove(default_key)
-
-    # Finally, translate entries in http_api into boolean settings for
-    # backwards compatability of JSON http-api.conf file
-    _translate_values_to_boolean(http_api)
+    if http_api.from_defaults(['graphql']):
+        del http_api['graphql']
 
     return http_api
 
-def verify(http_api):
-    return None
+def verify(_http_api):
+    return
 
 def generate(http_api):
     if http_api is None:
         if os.path.exists(systemd_service):
             os.unlink(systemd_service)
-        return None
-
-    if not os.path.exists('/etc/vyos'):
-        os.mkdir('/etc/vyos')
+        return
 
-    with open(api_conf_file, 'w') as f:
+    with open(api_config_state, 'w') as f:
         json.dump(http_api, f, indent=2)
 
     render(systemd_service, 'https/vyos-http-api.service.j2', http_api)
-    return None
 
 def apply(http_api):
     # Reload systemd manager configuration
     call('systemctl daemon-reload')
     service_name = 'vyos-http-api.service'
 
     if http_api is not None:
         if is_systemd_service_running(f'{service_name}'):
             call(f'systemctl reload {service_name}')
         else:
             call(f'systemctl restart {service_name}')
     else:
         call(f'systemctl stop {service_name}')
 
     # Let uvicorn settle before restarting Nginx
     sleep(1)
 
     call_dependents()
 
+    if os.path.exists(api_config_state):
+        os.unlink(api_config_state)
+
 if __name__ == '__main__':
     try:
         c = get_config()
         verify(c)
         generate(c)
         apply(c)
     except ConfigError as e:
         print(e)
         sys.exit(1)
diff --git a/src/conf_mode/https.py b/src/conf_mode/https.py
index 5cbdd1651..81e510b0d 100755
--- a/src/conf_mode/https.py
+++ b/src/conf_mode/https.py
@@ -1,287 +1,270 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2019-2022 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys
 
 from copy import deepcopy
 
 import vyos.defaults
 import vyos.certbot_util
 
 from vyos.config import Config
 from vyos.configverify import verify_vrf
 from vyos import ConfigError
 from vyos.pki import wrap_certificate
 from vyos.pki import wrap_private_key
 from vyos.template import render
 from vyos.utils.process import call
 from vyos.utils.network import check_port_availability
 from vyos.utils.network import is_listen_port_bind_service
 from vyos.utils.file import write_file
 
 from vyos import airbag
 airbag.enable()
 
 config_file = '/etc/nginx/sites-available/default'
 systemd_override = r'/run/systemd/system/nginx.service.d/override.conf'
 cert_dir = '/etc/ssl/certs'
 key_dir = '/etc/ssl/private'
 certbot_dir = vyos.defaults.directories['certbot']
 
 # https config needs to coordinate several subsystems: api, certbot,
 # self-signed certificate, as well as the virtual hosts defined within the
 # https config definition itself. Consequently, one needs a general dict,
 # encompassing the https and other configs, and a list of such virtual hosts
 # (server blocks in nginx terminology) to pass to the jinja2 template.
 default_server_block = {
     'id'        : '',
     'address'   : '*',
     'port'      : '443',
     'name'      : ['_'],
-    'api'       : {},
+    'api'       : False,
     'vyos_cert' : {},
     'certbot'   : False
 }
 
 def get_config(config=None):
     if config:
         conf = config
     else:
         conf = Config()
 
     base = ['service', 'https']
     if not conf.exists(base):
         return None
 
     https = conf.get_config_dict(base, get_first_key=True)
 
     if https:
         https['pki'] = conf.get_config_dict(['pki'], key_mangling=('-', '_'),
                                 get_first_key=True, no_tag_node_value_mangle=True)
 
     return https
 
 def verify(https):
     from vyos.utils.dict import dict_search
 
     if https is None:
         return None
 
     if 'certificates' in https:
         certificates = https['certificates']
 
         if 'certificate' in certificates:
             if not https['pki']:
                 raise ConfigError("PKI is not configured")
 
             cert_name = certificates['certificate']
 
             if cert_name not in https['pki']['certificate']:
                 raise ConfigError("Invalid certificate on https configuration")
 
             pki_cert = https['pki']['certificate'][cert_name]
 
             if 'certificate' not in pki_cert:
                 raise ConfigError("Missing certificate on https configuration")
 
             if 'private' not in pki_cert or 'key' not in pki_cert['private']:
                 raise ConfigError("Missing certificate private key on https configuration")
 
         if 'certbot' in https['certificates']:
             vhost_names = []
             for vh, vh_conf in https.get('virtual-host', {}).items():
                 vhost_names += vh_conf.get('server-name', [])
             domains = https['certificates']['certbot'].get('domain-name', [])
             domains_found = [domain for domain in domains if domain in vhost_names]
             if not domains_found:
                 raise ConfigError("At least one 'virtual-host <id> server-name' "
                               "matching the 'certbot domain-name' is required.")
 
     server_block_list = []
 
     # organize by vhosts
     vhost_dict = https.get('virtual-host', {})
 
     if not vhost_dict:
         # no specified virtual hosts (server blocks); use default
         server_block_list.append(default_server_block)
     else:
         for vhost in list(vhost_dict):
             server_block = deepcopy(default_server_block)
             data = vhost_dict.get(vhost, {})
             server_block['address'] = data.get('listen-address', '*')
             server_block['port'] = data.get('port', '443')
             server_block_list.append(server_block)
 
     for entry in server_block_list:
         _address = entry.get('address')
         _address = '0.0.0.0' if _address == '*' else _address
         _port = entry.get('port')
         proto = 'tcp'
         if check_port_availability(_address, int(_port), proto) is not True and \
                 not is_listen_port_bind_service(int(_port), 'nginx'):
             raise ConfigError(f'"{proto}" port "{_port}" is used by another service')
 
     verify_vrf(https)
 
     # Verify API server settings, if present
     if 'api' in https:
         keys = dict_search('api.keys.id', https)
         gql_auth_type = dict_search('api.graphql.authentication.type', https)
 
         # If "api graphql" is not defined and `gql_auth_type` is None,
         # there's certainly no JWT auth option, and keys are required
         jwt_auth = (gql_auth_type == "token")
 
         # Check for incomplete key configurations in every case
         valid_keys_exist = False
         if keys:
             for k in keys:
                 if 'key' not in keys[k]:
                     raise ConfigError(f'Missing HTTPS API key string for key id "{k}"')
                 else:
                     valid_keys_exist = True
 
         # If only key-based methods are enabled,
         # fail the commit if no valid key configurations are found
         if (not valid_keys_exist) and (not jwt_auth):
             raise ConfigError('At least one HTTPS API key is required unless GraphQL token authentication is enabled')
 
     return None
 
 def generate(https):
     if https is None:
         return None
 
     server_block_list = []
 
     # organize by vhosts
 
     vhost_dict = https.get('virtual-host', {})
 
     if not vhost_dict:
         # no specified virtual hosts (server blocks); use default
         server_block_list.append(default_server_block)
     else:
         for vhost in list(vhost_dict):
             server_block = deepcopy(default_server_block)
             server_block['id'] = vhost
             data = vhost_dict.get(vhost, {})
             server_block['address'] = data.get('listen-address', '*')
             server_block['port'] = data.get('port', '443')
             name = data.get('server-name', ['_'])
             server_block['name'] = name
             allow_client = data.get('allow-client', {})
             server_block['allow_client'] = allow_client.get('address', [])
             server_block_list.append(server_block)
 
     # get certificate data
 
     cert_dict = https.get('certificates', {})
 
     if 'certificate' in cert_dict:
         cert_name = cert_dict['certificate']
         pki_cert = https['pki']['certificate'][cert_name]
 
         cert_path = os.path.join(cert_dir, f'{cert_name}.pem')
         key_path = os.path.join(key_dir, f'{cert_name}.pem')
 
         server_cert = str(wrap_certificate(pki_cert['certificate']))
         if 'ca-certificate' in cert_dict:
             ca_cert = cert_dict['ca-certificate']
             server_cert += '\n' + str(wrap_certificate(https['pki']['ca'][ca_cert]['certificate']))
 
         write_file(cert_path, server_cert)
         write_file(key_path, wrap_private_key(pki_cert['private']['key']))
 
         vyos_cert_data = {
             'crt': cert_path,
             'key': key_path
         }
 
         for block in server_block_list:
             block['vyos_cert'] = vyos_cert_data
 
     # letsencrypt certificate using certbot
 
     certbot = False
     cert_domains = cert_dict.get('certbot', {}).get('domain-name', [])
     if cert_domains:
         certbot = True
         for domain in cert_domains:
             sub_list = vyos.certbot_util.choose_server_block(server_block_list,
                                                              domain)
             if sub_list:
                 for sb in sub_list:
                     sb['certbot'] = True
                     sb['certbot_dir'] = certbot_dir
                     # certbot organizes certificates by first domain
                     sb['certbot_domain_dir'] = cert_domains[0]
 
-    # get api data
-
-    api_set = False
-    api_data = {}
     if 'api' in list(https):
-        api_set = True
-        api_data = vyos.defaults.api_data
-    api_settings = https.get('api', {})
-    if api_settings:
-        vhosts = https.get('api-restrict', {}).get('virtual-host', [])
-        if vhosts:
-            api_data['vhost'] = vhosts[:]
-
-    if api_data:
-        vhost_list = api_data.get('vhost', [])
+        vhost_list = https.get('api-restrict', {}).get('virtual-host', [])
         if not vhost_list:
             for block in server_block_list:
-                block['api'] = api_data
+                block['api'] = True
         else:
             for block in server_block_list:
                 if block['id'] in vhost_list:
-                    block['api'] = api_data
-
-    if 'server_block_list' not in https or not https['server_block_list']:
-        https['server_block_list'] = [default_server_block]
+                    block['api'] = True
 
     data = {
         'server_block_list': server_block_list,
-        'api_set': api_set,
         'certbot': certbot
     }
 
     render(config_file, 'https/nginx.default.j2', data)
     render(systemd_override, 'https/override.conf.j2', https)
     return None
 
 def apply(https):
     # Reload systemd manager configuration
     call('systemctl daemon-reload')
     if https is not None:
         call('systemctl restart nginx.service')
     else:
         call('systemctl stop nginx.service')
 
 if __name__ == '__main__':
     try:
         c = get_config()
         verify(c)
         generate(c)
         apply(c)
     except ConfigError as e:
         print(e)
         sys.exit(1)
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server
index 85d7884b6..8a90786e2 100755
--- a/src/services/vyos-http-api-server
+++ b/src/services/vyos-http-api-server
@@ -1,926 +1,935 @@
 #!/usr/share/vyos-http-api-tools/bin/python3
 #
 # Copyright (C) 2019-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 
 import os
 import sys
 import grp
 import copy
 import json
 import logging
 import signal
 import traceback
 import threading
 from time import sleep
 from typing import List, Union, Callable, Dict
 
 from fastapi import FastAPI, Depends, Request, Response, HTTPException
 from fastapi import BackgroundTasks
 from fastapi.responses import HTMLResponse
 from fastapi.exceptions import RequestValidationError
 from fastapi.routing import APIRoute
 from pydantic import BaseModel, StrictStr, validator
 from starlette.middleware.cors import CORSMiddleware
 from starlette.datastructures import FormData
 from starlette.formparsers import FormParser, MultiPartParser
 from multipart.multipart import parse_options_header
 from uvicorn import Config as UvicornConfig
 from uvicorn import Server as UvicornServer
 
 from ariadne.asgi import GraphQL
 
 from vyos.config import Config
 from vyos.configtree import ConfigTree
 from vyos.configdiff import get_config_diff
 from vyos.configsession import ConfigSession, ConfigSessionError
 
 import api.graphql.state
 
-DEFAULT_CONFIG_FILE = '/etc/vyos/http-api.conf'
+api_config_state = '/tmp/api-config-state'
 CFG_GROUP = 'vyattacfg'
 
 debug = True
 
 logger = logging.getLogger(__name__)
 logs_handler = logging.StreamHandler()
 logger.addHandler(logs_handler)
 
 if debug:
     logger.setLevel(logging.DEBUG)
 else:
     logger.setLevel(logging.INFO)
 
 # Giant lock!
 lock = threading.Lock()
 
 def load_server_config():
-    with open(DEFAULT_CONFIG_FILE) as f:
+    with open(api_config_state) as f:
         config = json.load(f)
     return config
 
 def check_auth(key_list, key):
     key_id = None
     for k in key_list:
         if k['key'] == key:
             key_id = k['id']
     return key_id
 
 def error(code, msg):
     resp = {"success": False, "error": msg, "data": None}
     resp = json.dumps(resp)
     return HTMLResponse(resp, status_code=code)
 
 def success(data):
     resp = {"success": True, "data": data, "error": None}
     resp = json.dumps(resp)
     return HTMLResponse(resp)
 
 # Pydantic models for validation
 # Pydantic will cast when possible, so use StrictStr
 # validators added as needed for additional constraints
 # schema_extra adds anotations to OpenAPI, to add examples
 
 class ApiModel(BaseModel):
     key: StrictStr
 
 class BasePathModel(BaseModel):
     op: StrictStr
     path: List[StrictStr]
 
     @validator("path")
     def check_non_empty(cls, path):
         if not len(path) > 0:
             raise ValueError('path must be non-empty')
         return path
 
 class BaseConfigureModel(BasePathModel):
     value: StrictStr = None
 
 class ConfigureModel(ApiModel, BaseConfigureModel):
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "set | delete | comment",
                 "path": ['config', 'mode', 'path'],
             }
         }
 
 class ConfigureListModel(ApiModel):
     commands: List[BaseConfigureModel]
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "commands": "list of commands",
             }
         }
 
 class BaseConfigSectionModel(BasePathModel):
     section: Dict
 
 class ConfigSectionModel(ApiModel, BaseConfigSectionModel):
     pass
 
 class ConfigSectionListModel(ApiModel):
     commands: List[BaseConfigSectionModel]
 
 class RetrieveModel(ApiModel):
     op: StrictStr
     path: List[StrictStr]
     configFormat: StrictStr = None
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "returnValue | returnValues | exists | showConfig",
                 "path": ['config', 'mode', 'path'],
                 "configFormat": "json (default) | json_ast | raw",
 
             }
         }
 
 class ConfigFileModel(ApiModel):
     op: StrictStr
     file: StrictStr = None
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "save | load",
                 "file": "filename",
             }
         }
 
 class ImageModel(ApiModel):
     op: StrictStr
     url: StrictStr = None
     name: StrictStr = None
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "add | delete",
                 "url": "imagelocation",
                 "name": "imagename",
             }
         }
 
 class ContainerImageModel(ApiModel):
     op: StrictStr
     name: StrictStr = None
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "add | delete | show",
                 "name": "imagename",
             }
         }
 
 class GenerateModel(ApiModel):
     op: StrictStr
     path: List[StrictStr]
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "generate",
                 "path": ["op", "mode", "path"],
             }
         }
 
 class ShowModel(ApiModel):
     op: StrictStr
     path: List[StrictStr]
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "show",
                 "path": ["op", "mode", "path"],
             }
         }
 
 class RebootModel(ApiModel):
     op: StrictStr
     path: List[StrictStr]
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "reboot",
                 "path": ["op", "mode", "path"],
             }
         }
 
 class ResetModel(ApiModel):
     op: StrictStr
     path: List[StrictStr]
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "reset",
                 "path": ["op", "mode", "path"],
             }
         }
 
 class PoweroffModel(ApiModel):
     op: StrictStr
     path: List[StrictStr]
 
     class Config:
         schema_extra = {
             "example": {
                 "key": "id_key",
                 "op": "poweroff",
                 "path": ["op", "mode", "path"],
             }
         }
 
 
 class Success(BaseModel):
     success: bool
     data: Union[str, bool, Dict]
     error: str
 
 class Error(BaseModel):
     success: bool = False
     data: Union[str, bool, Dict]
     error: str
 
 responses = {
     200: {'model': Success},
     400: {'model': Error},
     422: {'model': Error, 'description': 'Validation Error'},
     500: {'model': Error}
 }
 
 def auth_required(data: ApiModel):
     key = data.key
     api_keys = app.state.vyos_keys
     key_id = check_auth(api_keys, key)
     if not key_id:
         raise HTTPException(status_code=401, detail="Valid API key is required")
     app.state.vyos_id = key_id
 
 # override Request and APIRoute classes in order to convert form request to json;
 # do all explicit validation here, for backwards compatability of error messages;
 # the explicit validation may be dropped, if desired, in favor of native
 # validation by FastAPI/Pydantic, as is used for application/json requests
 class MultipartRequest(Request):
     _form_err = ()
     @property
     def form_err(self):
         return self._form_err
 
     @form_err.setter
     def form_err(self, val):
         if not self._form_err:
             self._form_err = val
 
     @property
     def orig_headers(self):
         self._orig_headers = super().headers
         return self._orig_headers
 
     @property
     def headers(self):
         self._headers = super().headers.mutablecopy()
         self._headers['content-type'] = 'application/json'
         return self._headers
 
     async def form(self) -> FormData:
         if self._form is None:
             assert (
                 parse_options_header is not None
             ), "The `python-multipart` library must be installed to use form parsing."
             content_type_header = self.orig_headers.get("Content-Type")
             content_type, options = parse_options_header(content_type_header)
             if content_type == b"multipart/form-data":
                 multipart_parser = MultiPartParser(self.orig_headers, self.stream())
                 self._form = await multipart_parser.parse()
             elif content_type == b"application/x-www-form-urlencoded":
                 form_parser = FormParser(self.orig_headers, self.stream())
                 self._form = await form_parser.parse()
             else:
                 self._form = FormData()
         return self._form
 
     async def body(self) -> bytes:
         if not hasattr(self, "_body"):
             forms = {}
             merge = {}
             body = await super().body()
             self._body = body
 
             form_data = await self.form()
             if form_data:
                 endpoint = self.url.path
                 logger.debug("processing form data")
                 for k, v in form_data.multi_items():
                     forms[k] = v
 
                 if 'data' not in forms:
                     self.form_err = (422, "Non-empty data field is required")
                     return self._body
                 else:
                     try:
                         tmp = json.loads(forms['data'])
                     except json.JSONDecodeError as e:
                         self.form_err = (400, f'Failed to parse JSON: {e}')
                         return self._body
                     if isinstance(tmp, list):
                         merge['commands'] = tmp
                     else:
                         merge = tmp
 
                 if 'commands' in merge:
                     cmds = merge['commands']
                 else:
                     cmds = copy.deepcopy(merge)
                     cmds = [cmds]
 
                 for c in cmds:
                     if not isinstance(c, dict):
                         self.form_err = (400,
                         f"Malformed command '{c}': any command must be JSON of dict")
                         return self._body
                     if 'op' not in c:
                         self.form_err = (400,
                         f"Malformed command '{c}': missing 'op' field")
                     if endpoint not in ('/config-file', '/container-image',
                                         '/image'):
                         if 'path' not in c:
                             self.form_err = (400,
                             f"Malformed command '{c}': missing 'path' field")
                         elif not isinstance(c['path'], list):
                             self.form_err = (400,
                             f"Malformed command '{c}': 'path' field must be a list")
                         elif not all(isinstance(el, str) for el in c['path']):
                             self.form_err = (400,
                             f"Malformed command '{0}': 'path' field must be a list of strings")
                     if endpoint in ('/configure'):
                         if not c['path']:
                             self.form_err = (400,
                             f"Malformed command '{c}': 'path' list must be non-empty")
                         if 'value' in c and not isinstance(c['value'], str):
                             self.form_err = (400,
                             f"Malformed command '{c}': 'value' field must be a string")
                     if endpoint in ('/configure-section'):
                         if 'section' not in c:
                             self.form_err = (400,
                             f"Malformed command '{c}': missing 'section' field")
                         elif not isinstance(c['section'], dict):
                             self.form_err = (400,
                             f"Malformed command '{c}': 'section' field must be JSON of dict")
 
                 if 'key' not in forms and 'key' not in merge:
                     self.form_err = (401, "Valid API key is required")
                 if 'key' in forms and 'key' not in merge:
                     merge['key'] = forms['key']
 
                 new_body = json.dumps(merge)
                 new_body = new_body.encode()
                 self._body = new_body
 
         return self._body
 
 class MultipartRoute(APIRoute):
     def get_route_handler(self) -> Callable:
         original_route_handler = super().get_route_handler()
 
         async def custom_route_handler(request: Request) -> Response:
             request = MultipartRequest(request.scope, request.receive)
             try:
                 response: Response = await original_route_handler(request)
             except HTTPException as e:
                 return error(e.status_code, e.detail)
             except Exception as e:
                 form_err = request.form_err
                 if form_err:
                     return error(*form_err)
                 raise e
 
             return response
 
         return custom_route_handler
 
 app = FastAPI(debug=True,
               title="VyOS API",
               version="0.1.0",
               responses={**responses},
               dependencies=[Depends(auth_required)])
 
 app.router.route_class = MultipartRoute
 
 @app.exception_handler(RequestValidationError)
 async def validation_exception_handler(request, exc):
     return error(400, str(exc.errors()[0]))
 
 self_ref_msg = "Requested HTTP API server configuration change; commit will be called in the background"
 
 def call_commit(s: ConfigSession):
     try:
         s.commit()
     except ConfigSessionError as e:
         s.discard()
         if app.state.vyos_debug:
             logger.warning(f"ConfigSessionError:\n {traceback.format_exc()}")
         else:
             logger.warning(f"ConfigSessionError: {e}")
 
 def _configure_op(data: Union[ConfigureModel, ConfigureListModel,
                               ConfigSectionModel, ConfigSectionListModel],
                   request: Request, background_tasks: BackgroundTasks):
     session = app.state.vyos_session
     env = session.get_session_env()
     config = Config(session_env=env)
 
     endpoint = request.url.path
 
     # Allow users to pass just one command
     if not isinstance(data, ConfigureListModel):
         data = [data]
     else:
         data = data.commands
 
     # We don't want multiple people/apps to be able to commit at once,
     # or modify the shared session while someone else is doing the same,
     # so the lock is really global
     lock.acquire()
 
     status = 200
     msg = None
     error_msg = None
     try:
         for c in data:
             op = c.op
             path = c.path
 
             if isinstance(c, BaseConfigureModel):
                 if c.value:
                     value = c.value
                 else:
                     value = ""
                 # For vyos.configsession calls that have no separate value arguments,
                 # and for type checking too
                 cfg_path = " ".join(path + [value]).strip()
 
             elif isinstance(c, BaseConfigSectionModel):
                 section = c.section
 
             if isinstance(c, BaseConfigureModel):
                 if op == 'set':
                     session.set(path, value=value)
                 elif op == 'delete':
                     if app.state.vyos_strict and not config.exists(cfg_path):
                         raise ConfigSessionError(f"Cannot delete [{cfg_path}]: path/value does not exist")
                     session.delete(path, value=value)
                 elif op == 'comment':
                     session.comment(path, value=value)
                 else:
                     raise ConfigSessionError(f"'{op}' is not a valid operation")
 
             elif isinstance(c, BaseConfigSectionModel):
                 if op == 'set':
                     session.set_section(path, section)
                 elif op == 'load':
                     session.load_section(path, section)
                 else:
                     raise ConfigSessionError(f"'{op}' is not a valid operation")
         # end for
         config = Config(session_env=env)
         d = get_config_diff(config)
 
         if d.is_node_changed(['service', 'https']):
             background_tasks.add_task(call_commit, session)
             msg = self_ref_msg
         else:
             session.commit()
 
         logger.info(f"Configuration modified via HTTP API using key '{app.state.vyos_id}'")
     except ConfigSessionError as e:
         session.discard()
         status = 400
         if app.state.vyos_debug:
             logger.critical(f"ConfigSessionError:\n {traceback.format_exc()}")
         error_msg = str(e)
     except Exception as e:
         session.discard()
         logger.critical(traceback.format_exc())
         status = 500
 
         # Don't give the details away to the outer world
         error_msg = "An internal error occured. Check the logs for details."
     finally:
         lock.release()
 
     if status != 200:
         return error(status, error_msg)
 
     return success(msg)
 
 @app.post('/configure')
 def configure_op(data: Union[ConfigureModel,
                              ConfigureListModel],
                        request: Request, background_tasks: BackgroundTasks):
     return _configure_op(data, request, background_tasks)
 
 @app.post('/configure-section')
 def configure_section_op(data: Union[ConfigSectionModel,
                                      ConfigSectionListModel],
                                request: Request, background_tasks: BackgroundTasks):
     return _configure_op(data, request, background_tasks)
 
 @app.post("/retrieve")
 async def retrieve_op(data: RetrieveModel):
     session = app.state.vyos_session
     env = session.get_session_env()
     config = Config(session_env=env)
 
     op = data.op
     path = " ".join(data.path)
 
     try:
         if op == 'returnValue':
             res = config.return_value(path)
         elif op == 'returnValues':
             res = config.return_values(path)
         elif op == 'exists':
             res = config.exists(path)
         elif op == 'showConfig':
             config_format = 'json'
             if data.configFormat:
                 config_format = data.configFormat
 
             res = session.show_config(path=data.path)
             if config_format == 'json':
                 config_tree = ConfigTree(res)
                 res = json.loads(config_tree.to_json())
             elif config_format == 'json_ast':
                 config_tree = ConfigTree(res)
                 res = json.loads(config_tree.to_json_ast())
             elif config_format == 'raw':
                 pass
             else:
                 return error(400, f"'{config_format}' is not a valid config format")
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(res)
 
 @app.post('/config-file')
 def config_file_op(data: ConfigFileModel, background_tasks: BackgroundTasks):
     session = app.state.vyos_session
     env = session.get_session_env()
     op = data.op
     msg = None
 
     try:
         if op == 'save':
             if data.file:
                 path = data.file
             else:
                 path = '/config/config.boot'
             msg = session.save_config(path)
         elif op == 'load':
             if data.file:
                 path = data.file
             else:
                 return error(400, "Missing required field \"file\"")
 
             session.migrate_and_load_config(path)
 
             config = Config(session_env=env)
             d = get_config_diff(config)
 
             if d.is_node_changed(['service', 'https']):
                 background_tasks.add_task(call_commit, session)
                 msg = self_ref_msg
             else:
                 session.commit()
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(msg)
 
 @app.post('/image')
 def image_op(data: ImageModel):
     session = app.state.vyos_session
 
     op = data.op
 
     try:
         if op == 'add':
             if data.url:
                 url = data.url
             else:
                 return error(400, "Missing required field \"url\"")
             res = session.install_image(url)
         elif op == 'delete':
             if data.name:
                 name = data.name
             else:
                 return error(400, "Missing required field \"name\"")
             res = session.remove_image(name)
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(res)
 
 @app.post('/container-image')
 def container_image_op(data: ContainerImageModel):
     session = app.state.vyos_session
 
     op = data.op
 
     try:
         if op == 'add':
             if data.name:
                 name = data.name
             else:
                 return error(400, "Missing required field \"name\"")
             res = session.add_container_image(name)
         elif op == 'delete':
             if data.name:
                 name = data.name
             else:
                 return error(400, "Missing required field \"name\"")
             res = session.delete_container_image(name)
         elif op == 'show':
             res = session.show_container_image()
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(res)
 
 @app.post('/generate')
 def generate_op(data: GenerateModel):
     session = app.state.vyos_session
 
     op = data.op
     path = data.path
 
     try:
         if op == 'generate':
             res = session.generate(path)
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(res)
 
 @app.post('/show')
 def show_op(data: ShowModel):
     session = app.state.vyos_session
 
     op = data.op
     path = data.path
 
     try:
         if op == 'show':
             res = session.show(path)
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(res)
 
 @app.post('/reboot')
 def reboot_op(data: RebootModel):
     session = app.state.vyos_session
 
     op = data.op
     path = data.path
 
     try:
         if op == 'reboot':
             res = session.reboot(path)
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(res)
 
 @app.post('/reset')
 def reset_op(data: ResetModel):
     session = app.state.vyos_session
 
     op = data.op
     path = data.path
 
     try:
         if op == 'reset':
             res = session.reset(path)
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(res)
 
 @app.post('/poweroff')
 def poweroff_op(data: PoweroffModel):
     session = app.state.vyos_session
 
     op = data.op
     path = data.path
 
     try:
         if op == 'poweroff':
             res = session.poweroff(path)
         else:
             return error(400, f"'{op}' is not a valid operation")
     except ConfigSessionError as e:
         return error(400, str(e))
     except Exception as e:
         logger.critical(traceback.format_exc())
         return error(500, "An internal error occured. Check the logs for details.")
 
     return success(res)
 
 
 ###
 # GraphQL integration
 ###
 
 def graphql_init(app: FastAPI = app):
     from api.graphql.libs.token_auth import get_user_context
     api.graphql.state.init()
     api.graphql.state.settings['app'] = app
 
     # import after initializaion of state
     from api.graphql.bindings import generate_schema
     schema = generate_schema()
 
     in_spec = app.state.vyos_introspection
 
     if app.state.vyos_origins:
         origins = app.state.vyos_origins
         app.add_route('/graphql', CORSMiddleware(GraphQL(schema,
                                                          context_value=get_user_context,
                                                          debug=True,
                                                          introspection=in_spec),
                                                  allow_origins=origins,
                                                  allow_methods=("GET", "POST", "OPTIONS"),
                                                  allow_headers=("Authorization",)))
     else:
         app.add_route('/graphql', GraphQL(schema,
                                           context_value=get_user_context,
                                           debug=True,
                                           introspection=in_spec))
 ###
 # Modify uvicorn to allow reloading server within the configsession
 ###
 
 server = None
 shutdown = False
 
 class ApiServerConfig(UvicornConfig):
     pass
 
 class ApiServer(UvicornServer):
     def install_signal_handlers(self):
         pass
 
 def reload_handler(signum, frame):
     global server
     logger.debug('Reload signal received...')
     if server is not None:
         server.handle_exit(signum, frame)
         server = None
         logger.info('Server stopping for reload...')
     else:
         logger.warning('Reload called for non-running server...')
 
 def shutdown_handler(signum, frame):
     global shutdown
     logger.debug('Shutdown signal received...')
     server.handle_exit(signum, frame)
     logger.info('Server shutdown...')
     shutdown = True
 
+def flatten_keys(d: dict) -> list[dict]:
+    keys_list = []
+    for el in list(d['keys'].get('id', {})):
+        key = d['keys']['id'][el].get('key', '')
+        if key:
+            keys_list.append({'id': el, 'key': key})
+    return keys_list
+
 def initialization(session: ConfigSession, app: FastAPI = app):
     global server
     try:
         server_config = load_server_config()
+        keys = flatten_keys(server_config)
     except Exception as e:
         logger.critical(f'Failed to load the HTTP API server config: {e}')
         sys.exit(1)
 
     app.state.vyos_session = session
-    app.state.vyos_keys = server_config['api_keys']
+    app.state.vyos_keys = keys
 
-    app.state.vyos_debug = server_config['debug']
-    app.state.vyos_strict = server_config['strict']
+    app.state.vyos_debug = bool('debug' in server_config)
+    app.state.vyos_strict = bool('strict' in server_config)
     app.state.vyos_origins = server_config.get('cors', {}).get('allow_origin', [])
     if 'graphql' in server_config:
         app.state.vyos_graphql = True
         if isinstance(server_config['graphql'], dict):
             if 'introspection' in server_config['graphql']:
                 app.state.vyos_introspection = True
             else:
                 app.state.vyos_introspection = False
-            # default value is merged in conf_mode http-api.py, if not set
+            # default values if not set explicitly
             app.state.vyos_auth_type = server_config['graphql']['authentication']['type']
             app.state.vyos_token_exp = server_config['graphql']['authentication']['expiration']
             app.state.vyos_secret_len = server_config['graphql']['authentication']['secret_length']
     else:
         app.state.vyos_graphql = False
 
     if app.state.vyos_graphql:
         graphql_init(app)
 
     config = ApiServerConfig(app, uds="/run/api.sock", proxy_headers=True)
     server = ApiServer(config)
 
 def run_server():
     try:
         server.run()
     except OSError as e:
         logger.critical(e)
         sys.exit(1)
 
 if __name__ == '__main__':
     # systemd's user and group options don't work, do it by hand here,
     # else no one else will be able to commit
     cfg_group = grp.getgrnam(CFG_GROUP)
     os.setgid(cfg_group.gr_gid)
 
     # Need to set file permissions to 775 too so that every vyattacfg group member
     # has write access to the running config
     os.umask(0o002)
 
     signal.signal(signal.SIGHUP, reload_handler)
     signal.signal(signal.SIGTERM, shutdown_handler)
 
     config_session = ConfigSession(os.getpid())
 
     while True:
         logger.debug('Enter main loop...')
         if shutdown:
             break
         if server is None:
             initialization(config_session)
             server.run()
         sleep(1)