diff --git a/README.md b/README.md
index 5e8dc42..b0446b9 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,8 @@
-# Law Enforcement Media Application (LEMA)
-
-The following installation steps compliment the full LEMA Administration Guide, available from the [IDOL documentation site](https://www.microfocus.com/documentation/idol/), under "IDOL Government Solutions".
+# Concept Graph Analytics (CGA)
 
 ## Basic deployment
 
-To deploy LEMA to a Docker system, use the `deploy.py` tool, which requires Docker Compose.
+To deploy CGA to a Docker system, use the `deploy.py` tool, which requires Docker Compose.
 Required software versions:
 - Python 3, version 3.6 or later
 - Docker, version 20.10.22 or later
@@ -27,13 +25,11 @@ Run the `deploy.py` tool using Python.  (Much like when running `docker`, you
 may have to run it as a different user with sufficient permissions to manage Docker containers.)
 
 ```
-python3 deploy.py --init auth entity filestore analysis audit api ui
+python3 deploy.py --init auth entity audit cga
 ```
 
-With the default configuration, the LEMA UI will be available at `https://localhost:8070` once the
-system has started.
-
-After the system has started, log in with a user that has the `admin` role. The LEMA UI will then perform a one off initialization. 
+After the system has started, log into the Swagger UI `localhost:8060/swagger/` with a user that has the `admin` role
+and call the POST `/meta/initialize` endpoint to perform a one off initialization.
 
 To show options and other usage information, run:
 
@@ -50,7 +46,7 @@ of the settings.
 
 ## Encryption
 
-By default, the user-facing servers (authentication server, API, and UI) only accept encrypted 
+By default, the user-facing servers (authentication server and API) only accept encrypted 
 connections.  For this to work, you must obtain TLS certificates and copy them into the `config` 
 directory.  The required files are:
 
@@ -58,27 +54,25 @@ directory.  The required files are:
 - `config/https/api/tls.crt`: Server certificate for the API.
 - `config/https/auth/tls.key`: Private key for the authentication server.
 - `config/https/auth/tls.crt`: Server certificate for the authentication server.
-- `config/ui/auth/nginx.key`: Private key for the UI.
-- `config/ui/auth/nginx.crt`: Server certificate for the UI.
 
 ## Further examples
 
 To use HTTP instead of HTTPS, for testing purposes only, run:
 
 ```
-python3 deploy.py --disable-encryption --init auth entity filestore analysis analysis-live audit api ui
+python3 deploy.py --disable-encryption --init auth entity audit cga
 ```
 
 > note: changes to the encryption state of a deployed system require manual deletion of the realm in Keycloak before running `deploy.py` with the new state.
 
-To resume a stopped LEMA system, or to apply changes made to configuration files, or to change which
+To resume a stopped CGA system, or to apply changes made to configuration files, or to change which
 components are deployed: run the normal command to deploy, but without the `--init` argument:
 
 ```
-python3 deploy.py auth entity filestore analysis analysis-live audit api ui
+python3 deploy.py auth entity audit cga
 ```
 
-To stop and remove deployed LEMA services, run the Python `deploy.py` tool with no arguments:
+To stop and remove deployed CGA services, run the Python `deploy.py` tool with no arguments:
 
 ```
 python3 deploy.py
@@ -92,7 +86,7 @@ configure hosts and ports in the files in `config/`, and then run on separate ho
 
 ```
 python3 deploy.py audit
-python3 deploy.py --init auth entity analysis analysis-live api ui
+python3 deploy.py --init auth entity cga
 ```
 
 ## System information
@@ -107,14 +101,10 @@ while others listen on 127.0.0.1 only):
 | entity        | 8021     | no         | ACI port of IDOL Content database backend for the Gremlin database   |
 | entity        | 8022     | no         | Index port of IDOL Content database backend for the Gremlin database |
 | entity        | 8023     | no         | Port of Cassandra database backend for the Gremlin database          |
-| filestore     | 8030     | no         | S3-compatible object storage                                         |
-| analysis      | 8040     | no         | NiFi server for media analysis (API and admin UI)                    |
-| analysis-live | 8080     | no         | ACI port of IDOL Media Server used for live media analysis           |
 | audit         | 8050     | no         | PostgreSQL database storing audit logs                               |
 | api           | 8060     | yes        | System HTTP API                                                      |
-| ui            | 8070     | yes        | LEMA UI                                                              |
 
-Docker volumes are created with the prefix `micro-focus-idol-lema_`, which can be changed using the
+Docker volumes are created with the prefix `micro-focus-idol-cga_`, which can be changed using the
 `COMPOSE_PROJECT_NAME` setting.  The following volumes are created:
 
 | **Component** | **Volume name**                        | **Purpose**                                      |
@@ -123,10 +113,7 @@ Docker volumes are created with the prefix `micro-focus-idol-lema_`, which can b
 | entity        | entity-storagedb-data                  | Application data                                 |
 | entity        | entity-indexdb-data                    | Search index for application data                |
 | entity        | entity-indexdb-license-data            | Cache for license information                    |
-| filestore     | filestore-service-data                 | Uploaded and generated files                     |
-| analysis-live | analysis-live-mediaserver-license-data | Cache for license information                    |
-| analysis-live | analysis-live-mediaserver-output       | Temporary video and data files for live analysis |
 | audit         | audit-db-data                          | Audit logs                                       |
 
-All containers connect to a Docker network called `micro-focus-idol-lema_main`.  The
-`micro-focus-idol-lema` prefix can be changed using the `COMPOSE_PROJECT_NAME` setting.
+All containers connect to a Docker network called `micro-focus-idol-cga_main`.  The
+`micro-focus-idol-cga` prefix can be changed using the `COMPOSE_PROJECT_NAME` setting.
diff --git a/config-fixed/base.env b/config-fixed/base.env
index 0ac9977..d5c7440 100644
--- a/config-fixed/base.env
+++ b/config-fixed/base.env
@@ -4,9 +4,6 @@ ISOL_DOCKER_NAME_SEP=/
 ISOL_DOCKER_VERSION_SEP=:
 ISOL_BASE_VERSION=2.3.1
 ISOL_API_VERSION=2.3.1
-ISOL_ANALYSIS_NIFI_VERSION=2.3.1
-ISOL_ANALYSIS_LIVE_VERSION=2.3.1
-LEMA_VERSION=2.3.1
 ISOL_POSTGRES_VERSION=14.4
 
 ISOL_EXTERNAL_PROTOCOL=https
@@ -14,4 +11,3 @@ ISOL_ENTITY_SERVICE_TRAVERSAL_SOURCE=entitiesTraversal
 ISOL_AUTH_SERVICE_INTERNAL_PORT=8443
 ISOL_AUTH_SERVICE_TLS_REQUIRED=all
 ISOL_API_SERVICE_INTERNAL_PORT=8443
-LEMA_UI_INTERNAL_PORT=443
diff --git a/config-fixed/api.env b/config-fixed/cga.env
similarity index 65%
rename from config-fixed/api.env
rename to config-fixed/cga.env
index 23b6866..2d411b2 100644
--- a/config-fixed/api.env
+++ b/config-fixed/cga.env
@@ -1,6 +1,6 @@
-ISOL_API_SERVICE_APPLICATION_TYPE=lema
+ISOL_API_SERVICE_APPLICATION_TYPE=conceptgraph
 # relative to docker-compose/
-ISOL_API_SERVICE_TLS_CERT_DIR=../config/https/api
+ISOL_API_SERVICE_TLS_CERT_DIR=../config/https/cga
 ISOL_API_SERVICE_WATCHLIST_MIN_EVENT_AGE_SECONDS=60
 ISOL_API_SERVICE_STATS_MIN_ANALYSIS_JOB_EVENT_AGE_SECONDS=60
 ISOL_API_SERVICE_ADDITIONAL_ALLOWED_ORIGINS=
diff --git a/config-fixed/ui.env b/config-fixed/ui.env
deleted file mode 100644
index 1d9d47e..0000000
--- a/config-fixed/ui.env
+++ /dev/null
@@ -1,2 +0,0 @@
-# relative to docker-compose/
-LEMA_UI_TLS_CERT_DIR=../config/https/ui
diff --git a/config-fixed/unencrypted.env b/config-fixed/unencrypted.env
index 12812f3..94dfa64 100644
--- a/config-fixed/unencrypted.env
+++ b/config-fixed/unencrypted.env
@@ -6,6 +6,3 @@ ISOL_AUTH_SERVICE_TLS_CERT_DIR=../config/empty
 
 ISOL_API_SERVICE_INTERNAL_PORT=8080
 ISOL_API_SERVICE_TLS_CERT_DIR=../config/empty
-
-LEMA_UI_INTERNAL_PORT=80
-LEMA_UI_TLS_CERT_DIR=../config/empty
diff --git a/config/analysis-live.env b/config/analysis-live.env
deleted file mode 100644
index d5a83e4..0000000
--- a/config/analysis-live.env
+++ /dev/null
@@ -1,2 +0,0 @@
-# address on the Docker host to expose the Media Server port on
-ISOL_ANALYSIS_LIVE_MEDIASERVER_ACI_DOCKER_PORT=127.0.0.1:8080
diff --git a/config/analysis.env b/config/analysis.env
deleted file mode 100644
index bdd4a88..0000000
--- a/config/analysis.env
+++ /dev/null
@@ -1,7 +0,0 @@
-# address on the Docker host to expose the admin UI and management port on
-ISOL_ANALYSIS_SERVICE_DOCKER_PORT=127.0.0.1:8040
-
-# nifi processor thread configuration. These default to 1
-ISOL_ANALYSIS_FACE_DEC_THREADS=1
-ISOL_ANALYSIS_VEHICLE_THREADS=1
-ISOL_ANALYSIS_OBJECT_THREADS=1
diff --git a/config/api.env b/config/api.env
deleted file mode 100644
index 4c5d96c..0000000
--- a/config/api.env
+++ /dev/null
@@ -1,9 +0,0 @@
-# location of the `analysis` component, as accessed from Docker containers
-ISOL_ANALYSIS_HOST=analysis-service
-ISOL_ANALYSIS_API_PORT=8090
-ISOL_ANALYSIS_API_PATH=/
-ISOL_ANALYSIS_JOBS_PORT=8091
-ISOL_ANALYSIS_JOBS_PATH=/
-
-# address on the Docker host to expose the web server port on
-ISOL_API_SERVICE_DOCKER_PORT=8060
diff --git a/config/auth.env b/config/auth.env
index 828769b..01832f0 100644
--- a/config/auth.env
+++ b/config/auth.env
@@ -1,10 +1,10 @@
 # address on the Docker host to expose the configuration database port on
 ISOL_AUTH_DB_DOCKER_PORT=127.0.0.1:8000
 # credentials to configure and use for accessing the configuration database
-ISOL_AUTH_DB_USERNAME=lema
-ISOL_AUTH_DB_PASSWORD=lema
+ISOL_AUTH_DB_USERNAME=cga
+ISOL_AUTH_DB_PASSWORD=cga
 # name of the database to use for storing configuration in
-ISOL_AUTH_DB_NAME=lema-auth
+ISOL_AUTH_DB_NAME=cga-auth
 
 # address on the Docker host to expose the authentication server and management UI port on
 ISOL_AUTH_SERVICE_DOCKER_PORT=8010
diff --git a/config/base.env b/config/base.env
index a9f629c..7270772 100644
--- a/config/base.env
+++ b/config/base.env
@@ -1,5 +1,5 @@
 # prefix used for containers, volumes and networks
-COMPOSE_PROJECT_NAME=micro-focus-idol-lema
+COMPOSE_PROJECT_NAME=micro-focus-idol-cga
 
 # location of the License Server
 ISOL_LICENSE_SERVER_HOST=licenseserver
@@ -15,17 +15,15 @@ ISOL_AUTH_SERVICE_EXTERNAL_HOST=localhost
 ISOL_AUTH_SERVICE_EXTERNAL_PORT=8010
 ISOL_AUTH_SERVICE_EXTERNAL_PATH=/
 # realm in the authentication server to configure and use
-ISOL_AUTH_SERVICE_REALM=lema
+ISOL_AUTH_SERVICE_REALM=cga
 # credentials to configure and use for managing the authentication server
-ISOL_AUTH_SERVICE_ADMIN_USERNAME=lema-auth
-ISOL_AUTH_SERVICE_ADMIN_PASSWORD=lema-auth
+ISOL_AUTH_SERVICE_ADMIN_USERNAME=cga-auth
+ISOL_AUTH_SERVICE_ADMIN_PASSWORD=cga-auth
 # client and client credentials to configure and use for API requests
-ISOL_AUTH_SERVICE_API_CLIENT=lema_api
+ISOL_AUTH_SERVICE_API_CLIENT=cga
 # changes to this value will only be applied when deploying to a new realm. 
 # manually remove the existing realm from the Keycloak UI and re-run the script.
 ISOL_AUTH_SERVICE_API_CLIENT_SECRET=d0e76ad7-7d6b-4d86-be3a-5dfe715dbf87
-# client to configure and use for logging into the UI
-ISOL_AUTH_SERVICE_UI_CLIENT=lema_ui
 
 # location of the `entity` component, as accessed from Docker containers
 ISOL_ENTITY_STORAGEDB_HOST=entity-storagedb
@@ -34,37 +32,20 @@ ISOL_ENTITY_INDEXDB_HOST=entity-indexdb
 ISOL_ENTITY_INDEXDB_ACI_PORT=9100
 ISOL_ENTITY_INDEXDB_INDEX_PORT=9101
 
-# location of the `filestore` component, as accessed from Docker containers
-ISOL_FILESTORE_SERVICE_PROTOCOL=http
-ISOL_FILESTORE_SERVICE_HOST=filestore-service
-ISOL_FILESTORE_SERVICE_PORT=8000
-ISOL_FILESTORE_SERVICE_PATH=/
-# credentials to configure and use for accessing the object store
-ISOL_FILESTORE_SERVICE_USERNAME=lema-filestore
-ISOL_FILESTORE_SERVICE_PASSWORD=lema-filestore
-# bucket to use for storing files in the object store
-ISOL_FILESTORE_SERVICE_BUCKET=isol-demo-bucket
-
 # location of the `audit` component, as accessed from Docker containers
 ISOL_AUDIT_DB_HOST=audit-db
 ISOL_AUDIT_DB_PORT=5432
 # credentials to configure and use for accessing the audit database
-ISOL_AUDIT_DB_USERNAME=lema-audit
-ISOL_AUDIT_DB_PASSWORD=lema-audit
+ISOL_AUDIT_DB_USERNAME=cga-audit
+ISOL_AUDIT_DB_PASSWORD=cga-audit
 # name of the database to configure and use for storing audit logs in
-ISOL_AUDIT_DB_NAME=lema-audit
+ISOL_AUDIT_DB_NAME=cga-audit
 
 
 # changes to any of the values below will only be applied when deploying to a new realm. 
 # manually remove the existing realm from the Keycloak UI and re-run the script.
 
-# location of the `api` component, as accessed by a user
+# location of the `cga` component, as accessed by a user
 ISOL_API_SERVICE_EXTERNAL_HOST=localhost
 ISOL_API_SERVICE_EXTERNAL_PORT=8060
 ISOL_API_SERVICE_EXTERNAL_PATH=/
-
-# location of the `ui` component, as accessed by a user
-LEMA_UI_EXTERNAL_HOST=localhost
-LEMA_UI_EXTERNAL_PORT=8070
-# this must end in /
-LEMA_UI_EXTERNAL_PATH=/
diff --git a/config/ui.env b/config/cga.env
similarity index 64%
rename from config/ui.env
rename to config/cga.env
index cd0ecbb..4c4865f 100644
--- a/config/ui.env
+++ b/config/cga.env
@@ -1,2 +1,2 @@
 # address on the Docker host to expose the web server port on
-LEMA_UI_DOCKER_PORT=8070
+ISOL_API_SERVICE_DOCKER_PORT=8060
diff --git a/config/filestore.env b/config/filestore.env
deleted file mode 100644
index 1b637a1..0000000
--- a/config/filestore.env
+++ /dev/null
@@ -1,2 +0,0 @@
-# address on the Docker host to expose the object store port on
-ISOL_FILESTORE_SERVICE_DOCKER_PORT=127.0.0.1:8030
diff --git a/config/https/api/tls.crt b/config/https/cga/tls.crt
similarity index 100%
rename from config/https/api/tls.crt
rename to config/https/cga/tls.crt
diff --git a/config/https/api/tls.key b/config/https/cga/tls.key
similarity index 100%
rename from config/https/api/tls.key
rename to config/https/cga/tls.key
diff --git a/config/https/ui/nginx.crt b/config/https/ui/nginx.crt
deleted file mode 100644
index 066f2da..0000000
--- a/config/https/ui/nginx.crt
+++ /dev/null
@@ -1 +0,0 @@
-this is not a valid certificate - replace it when you enable HTTPS
diff --git a/config/https/ui/nginx.key b/config/https/ui/nginx.key
deleted file mode 100644
index 14855e8..0000000
--- a/config/https/ui/nginx.key
+++ /dev/null
@@ -1 +0,0 @@
-this is not a valid private key - replace it when you enable HTTPS
diff --git a/deploy.py b/deploy.py
index b45f4af..1513fff 100644
--- a/deploy.py
+++ b/deploy.py
@@ -33,10 +33,10 @@ def wrap(text):
 
 
 DESCRIPTION = '''
-Deploy IDOL LEMA.
+Deploy IDOL CGA.
 
 ''' + wrap('''\
-This program deploys components of the LEMA system, or resumes a stopped system, or reconfigures an
+This program deploys components of the CGA system, or resumes a stopped system, or reconfigures an
 existing system.  Before running, check and update the configuration in `config/base.env`.
 ''') + '''
 
@@ -52,10 +52,7 @@ def wrap(text):
 ''') + '''
 
 - entity: storage for application data
-- analysis: media analysis system
-- analysis-live: live media analysis system
 - api: user-facing web server
-- ui: user-facing web server
 
 ''' + wrap('''\
 The components that may be deployed using this script, or may be deployed manually using suitable
@@ -63,7 +60,6 @@ def wrap(text):
 ''') + '''
 
 - auth: user-facing web server - Keycloak authentication server
-- filestore: storage for files - Amazon S3-compatible object storage
 - audit: storage for audit logs - PostgreSQL database server
 '''
 
diff --git a/docker-compose/docker-compose.analysis-live.yml b/docker-compose/docker-compose.analysis-live.yml
deleted file mode 100644
index 3205d4f..0000000
--- a/docker-compose/docker-compose.analysis-live.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# (c) Copyright 2022 Micro Focus or one of its affiliates.
-#
-# Licensed under the MIT License (the "License"); you may not use this file
-# except in compliance with the License.
-#
-# The only warranties for products and services of Micro Focus and its affiliates
-# and licensors ("Micro Focus") are as may be set forth in the express warranty
-# statements accompanying such products and services. Nothing herein should be
-# construed as constituting an additional warranty. Micro Focus shall not be
-# liable for technical or editorial errors or omissions contained herein. The
-# information contained herein is subject to change without notice.
-#
-
-services:
-
-  analysis-live-mediaserver:
-    image: ${ISOL_DOCKER_REGISTRY}${ISOL_DOCKER_NAME_SEP}solutions-analysis-live-mediaserver${ISOL_DOCKER_VERSION_SEP}${ISOL_BASE_VERSION}
-    networks:
-      - main
-    volumes:
-      - analysis-live-mediaserver-license-data:/mediaserver/license-cache
-      - analysis-live-mediaserver-output:/mediaserver/output
-    ports:
-      - ${ISOL_ANALYSIS_LIVE_MEDIASERVER_ACI_DOCKER_PORT}:14000
-    environment:
-      - ISOL_LICENSE_SERVER_HOST=${ISOL_LICENSE_SERVER_HOST}
-      - ISOL_LICENSE_SERVER_PORT=${ISOL_LICENSE_SERVER_PORT}
-
-  analysis-live-processor:
-    image: ${ISOL_DOCKER_REGISTRY}${ISOL_DOCKER_NAME_SEP}solutions-analysis-live-processor${ISOL_DOCKER_VERSION_SEP}${ISOL_ANALYSIS_LIVE_VERSION}
-    networks:
-      - main
-    volumes:
-      - analysis-live-mediaserver-output:/mediaserver-output
-    environment:
-      - ISOL_ENTITY_STORAGEDB_HOST=${ISOL_ENTITY_STORAGEDB_HOST}
-      - ISOL_ENTITY_STORAGEDB_PORT=${ISOL_ENTITY_STORAGEDB_PORT}
-      - ISOL_ENTITY_INDEXDB_HOST=${ISOL_ENTITY_INDEXDB_HOST}
-      - ISOL_ENTITY_INDEXDB_ACI_PORT=${ISOL_ENTITY_INDEXDB_ACI_PORT}
-      - ISOL_ENTITY_INDEXDB_INDEX_PORT=${ISOL_ENTITY_INDEXDB_INDEX_PORT}
-      - ISOL_AUDIT_HOST=${ISOL_AUDIT_DB_HOST}
-      - ISOL_AUDIT_PORT=${ISOL_AUDIT_DB_PORT}
-      - ISOL_AUDIT_USERNAME=${ISOL_AUDIT_DB_USERNAME}
-      - ISOL_AUDIT_PASSWORD=${ISOL_AUDIT_DB_PASSWORD}
-      - ISOL_AUDIT_DATABASE_NAME=${ISOL_AUDIT_DB_NAME}
-      - ISOL_ANALYSIS_LIVE_MEDIASERVER_HOST=analysis-live-mediaserver
-      - ISOL_ANALYSIS_LIVE_MEDIASERVER_ACI_PORT=14000
-
-volumes:
-  analysis-live-mediaserver-license-data:
-  analysis-live-mediaserver-output:
diff --git a/docker-compose/docker-compose.analysis.yml b/docker-compose/docker-compose.analysis.yml
deleted file mode 100644
index a2caa9f..0000000
--- a/docker-compose/docker-compose.analysis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# (c) Copyright 2021 Micro Focus or one of its affiliates.
-#
-# Licensed under the MIT License (the "License"); you may not use this file
-# except in compliance with the License.
-#
-# The only warranties for products and services of Micro Focus and its affiliates
-# and licensors ("Micro Focus") are as may be set forth in the express warranty
-# statements accompanying such products and services. Nothing herein should be
-# construed as constituting an additional warranty. Micro Focus shall not be
-# liable for technical or editorial errors or omissions contained herein. The
-# information contained herein is subject to change without notice.
-#
-
-services:
-
-  analysis-service:
-    image: ${ISOL_DOCKER_REGISTRY}${ISOL_DOCKER_NAME_SEP}solutions-analysis-service${ISOL_DOCKER_VERSION_SEP}${ISOL_ANALYSIS_NIFI_VERSION}
-    networks:
-      - main
-    ports:
-      - ${ISOL_ANALYSIS_SERVICE_DOCKER_PORT}:8090
-    environment:
-      - ISOL_AUDIT_DB_HOST=${ISOL_AUDIT_DB_HOST}
-      - ISOL_AUDIT_DB_PORT=${ISOL_AUDIT_DB_PORT}
-      - ISOL_AUDIT_DB_USERNAME=${ISOL_AUDIT_DB_USERNAME}
-      - ISOL_AUDIT_DB_PASSWORD=${ISOL_AUDIT_DB_PASSWORD}
-      - ISOL_AUDIT_DB_NAME=${ISOL_AUDIT_DB_NAME}
-      - ISOL_LICENSE_SERVER_HOST=${ISOL_LICENSE_SERVER_HOST}
-      - ISOL_LICENSE_SERVER_PORT=${ISOL_LICENSE_SERVER_PORT}
-      - ISOL_ENTITY_STORAGEDB_HOST=${ISOL_ENTITY_STORAGEDB_HOST}
-      - ISOL_ENTITY_STORAGEDB_PORT=${ISOL_ENTITY_STORAGEDB_PORT}
-      - ISOL_ENTITY_INDEXDB_HOST=${ISOL_ENTITY_INDEXDB_HOST}
-      - ISOL_ENTITY_INDEXDB_ACI_PORT=${ISOL_ENTITY_INDEXDB_ACI_PORT}
-      - ISOL_ENTITY_INDEXDB_INDEX_PORT=${ISOL_ENTITY_INDEXDB_INDEX_PORT}
-      - ISOL_FILE_STORE_URL=${ISOL_FILESTORE_SERVICE_PROTOCOL}://${ISOL_FILESTORE_SERVICE_HOST}:${ISOL_FILESTORE_SERVICE_PORT}${ISOL_FILESTORE_SERVICE_PATH}
-      - ISOL_FILE_STORE_USER=${ISOL_FILESTORE_SERVICE_USERNAME}
-      - ISOL_FILE_STORE_PASSWORD=${ISOL_FILESTORE_SERVICE_PASSWORD}
-      - ISOL_FILE_STORE_BUCKET=${ISOL_FILESTORE_SERVICE_BUCKET}
-      - ISOL_ANALYSIS_FACE_DEC_THREADS=${ISOL_ANALYSIS_FACE_DEC_THREADS}
-      - ISOL_ANALYSIS_VEHICLE_THREADS=${ISOL_ANALYSIS_VEHICLE_THREADS}
-      - ISOL_ANALYSIS_OBJECT_THREADS=${ISOL_ANALYSIS_OBJECT_THREADS}
diff --git a/docker-compose/docker-compose.auth-setup.yml b/docker-compose/docker-compose.auth-setup.yml
index 83f5ea6..819464e 100644
--- a/docker-compose/docker-compose.auth-setup.yml
+++ b/docker-compose/docker-compose.auth-setup.yml
@@ -29,6 +29,4 @@ services:
       - ISOL_AUTH_SERVICE_API_CLIENT=${ISOL_AUTH_SERVICE_API_CLIENT}
       - ISOL_AUTH_SERVICE_API_CLIENT_SECRET=${ISOL_AUTH_SERVICE_API_CLIENT_SECRET}
       - ISOL_AUTH_SERVICE_API_URL=${ISOL_EXTERNAL_PROTOCOL}://${ISOL_API_SERVICE_EXTERNAL_HOST}:${ISOL_API_SERVICE_EXTERNAL_PORT}${ISOL_API_SERVICE_EXTERNAL_PATH}
-      - ISOL_AUTH_SERVICE_UI_CLIENT=${ISOL_AUTH_SERVICE_UI_CLIENT}
-      - ISOL_AUTH_SERVICE_UI_URL=${ISOL_EXTERNAL_PROTOCOL}://${LEMA_UI_EXTERNAL_HOST}:${LEMA_UI_EXTERNAL_PORT}${LEMA_UI_EXTERNAL_PATH}*,${ISOL_AUTH_SERVICE_ADDITIONAL_UI_URLS}
       - ISOL_AUTH_SERVICE_TOKEN_EXPIRY_TIME=${ISOL_AUTH_SERVICE_TOKEN_EXPIRY_TIME}
diff --git a/docker-compose/docker-compose.api.yml b/docker-compose/docker-compose.cga.yml
similarity index 71%
rename from docker-compose/docker-compose.api.yml
rename to docker-compose/docker-compose.cga.yml
index 7c938c2..4e567ce 100644
--- a/docker-compose/docker-compose.api.yml
+++ b/docker-compose/docker-compose.cga.yml
@@ -13,9 +13,8 @@
 #
 
 services:
-
-  api-service:
-    image: ${ISOL_DOCKER_REGISTRY}${ISOL_DOCKER_NAME_SEP}solutions-api-service${ISOL_DOCKER_VERSION_SEP}${ISOL_API_VERSION}
+  cga-service:
+    image: ${ISOL_DOCKER_REGISTRY}${ISOL_DOCKER_NAME_SEP}solutions-cga-service${ISOL_DOCKER_VERSION_SEP}${ISOL_API_VERSION}
     networks:
       - main
     volumes:
@@ -36,25 +35,13 @@ services:
       - ISOL_AUTH_SERVICE_API_CLIENT=${ISOL_AUTH_SERVICE_API_CLIENT}
       - ISOL_AUTH_SERVICE_API_CLIENT_SECRET=${ISOL_AUTH_SERVICE_API_CLIENT_SECRET}
       - ISOL_AUTH_SERVICE_TLS_REQUIRED=${ISOL_AUTH_SERVICE_TLS_REQUIRED}
-      - ISOL_FILE_STORE_PROTOCOL=${ISOL_FILESTORE_SERVICE_PROTOCOL}
-      - ISOL_FILE_STORE_HOST=${ISOL_FILESTORE_SERVICE_HOST}
-      - ISOL_FILE_STORE_PORT=${ISOL_FILESTORE_SERVICE_PORT}
-      - ISOL_FILE_STORE_PATH=${ISOL_FILESTORE_SERVICE_PATH}
-      - ISOL_FILE_STORE_USER=${ISOL_FILESTORE_SERVICE_USERNAME}
-      - ISOL_FILE_STORE_PASSWORD=${ISOL_FILESTORE_SERVICE_PASSWORD}
-      - ISOL_FILE_STORE_BUCKET=${ISOL_FILESTORE_SERVICE_BUCKET}
-      - ISOL_ANALYSIS_HOST=${ISOL_ANALYSIS_HOST}
-      - ISOL_ANALYSIS_API_PORT=${ISOL_ANALYSIS_API_PORT}
-      - ISOL_ANALYSIS_API_PATH=${ISOL_ANALYSIS_API_PATH}
-      - ISOL_ANALYSIS_JOBS_PORT=${ISOL_ANALYSIS_JOBS_PORT}
-      - ISOL_ANALYSIS_JOBS_PATH=${ISOL_ANALYSIS_JOBS_PATH}
       - ISOL_AUDIT_HOST=${ISOL_AUDIT_DB_HOST}
       - ISOL_AUDIT_PORT=${ISOL_AUDIT_DB_PORT}
       - ISOL_AUDIT_USERNAME=${ISOL_AUDIT_DB_USERNAME}
       - ISOL_AUDIT_PASSWORD=${ISOL_AUDIT_DB_PASSWORD}
       - ISOL_AUDIT_DATABASE_NAME=${ISOL_AUDIT_DB_NAME}
       - ISOL_API_SERVICE_APPLICATION_TYPE=${ISOL_API_SERVICE_APPLICATION_TYPE}
-      - ISOL_API_SERVICE_ALLOWED_ORIGINS=${ISOL_EXTERNAL_PROTOCOL}://${LEMA_UI_EXTERNAL_HOST}:${LEMA_UI_EXTERNAL_PORT},${ISOL_API_SERVICE_ADDITIONAL_ALLOWED_ORIGINS}
+      - ISOL_API_SERVICE_ALLOWED_ORIGINS=${ISOL_API_SERVICE_ADDITIONAL_ALLOWED_ORIGINS}
       - ISOL_API_SERVICE_BASE_URL=${ISOL_EXTERNAL_PROTOCOL}://${ISOL_API_SERVICE_EXTERNAL_HOST}:${ISOL_API_SERVICE_EXTERNAL_PORT}${ISOL_API_SERVICE_EXTERNAL_PATH}
       - ISOL_WATCHLIST_MIN_EVENT_AGE_SECONDS=${ISOL_API_SERVICE_WATCHLIST_MIN_EVENT_AGE_SECONDS}
       - ISOL_STATS_MIN_ANALYSIS_JOB_EVENT_AGE_SECONDS=${ISOL_API_SERVICE_STATS_MIN_ANALYSIS_JOB_EVENT_AGE_SECONDS}
diff --git a/docker-compose/docker-compose.filestore.yml b/docker-compose/docker-compose.filestore.yml
deleted file mode 100644
index 9eca49f..0000000
--- a/docker-compose/docker-compose.filestore.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# (c) Copyright 2021 Micro Focus or one of its affiliates.
-#
-# Licensed under the MIT License (the "License"); you may not use this file
-# except in compliance with the License.
-#
-# The only warranties for products and services of Micro Focus and its affiliates
-# and licensors ("Micro Focus") are as may be set forth in the express warranty
-# statements accompanying such products and services. Nothing herein should be
-# construed as constituting an additional warranty. Micro Focus shall not be
-# liable for technical or editorial errors or omissions contained herein. The
-# information contained herein is subject to change without notice.
-#
-
-services:
-
-  filestore-service:
-    image: ${ISOL_DOCKER_REGISTRY}${ISOL_DOCKER_NAME_SEP}solutions-filestore-service${ISOL_DOCKER_VERSION_SEP}${ISOL_API_VERSION}
-    networks:
-      - main
-    volumes:
-      - filestore-service-data:/data
-    ports:
-      - ${ISOL_FILESTORE_SERVICE_DOCKER_PORT}:8000
-    environment:
-      - SCALITY_ACCESS_KEY_ID=${ISOL_FILESTORE_SERVICE_USERNAME}
-      - SCALITY_SECRET_ACCESS_KEY=${ISOL_FILESTORE_SERVICE_PASSWORD}
-
-volumes:
-  filestore-service-data:
-
-networks:
-  main:
diff --git a/docker-compose/docker-compose.ui.yml b/docker-compose/docker-compose.ui.yml
deleted file mode 100644
index 6327cd9..0000000
--- a/docker-compose/docker-compose.ui.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# (c) Copyright 2021 Micro Focus or one of its affiliates.
-#
-# Licensed under the MIT License (the "License"); you may not use this file
-# except in compliance with the License.
-#
-# The only warranties for products and services of Micro Focus and its affiliates
-# and licensors ("Micro Focus") are as may be set forth in the express warranty
-# statements accompanying such products and services. Nothing herein should be
-# construed as constituting an additional warranty. Micro Focus shall not be
-# liable for technical or editorial errors or omissions contained herein. The
-# information contained herein is subject to change without notice.
-#
-
-services:
-
-  ui:
-    image: ${ISOL_DOCKER_REGISTRY}${ISOL_DOCKER_NAME_SEP}lema-ui${ISOL_DOCKER_VERSION_SEP}${LEMA_VERSION}
-    networks:
-      - main
-    volumes:
-      - ${LEMA_UI_TLS_CERT_DIR}:/etc/nginx/ssl
-    ports:
-      - ${LEMA_UI_DOCKER_PORT}:${LEMA_UI_INTERNAL_PORT}
-    environment:
-      - ISOL_EXTERNAL_PROTOCOL=${ISOL_EXTERNAL_PROTOCOL}
-      - ISOL_API_SERVICE_EXTERNAL_HOST=${ISOL_API_SERVICE_EXTERNAL_HOST}
-      - ISOL_API_SERVICE_EXTERNAL_PORT=${ISOL_API_SERVICE_EXTERNAL_PORT}
-      - ISOL_API_SERVICE_EXTERNAL_PATH=${ISOL_API_SERVICE_EXTERNAL_PATH}
-      - LEMA_UI_EXTERNAL_HOST=${LEMA_UI_EXTERNAL_HOST}
-      - LEMA_UI_EXTERNAL_PORT=${LEMA_UI_EXTERNAL_PORT}
-      - LEMA_UI_EXTERNAL_PATH=${LEMA_UI_EXTERNAL_PATH}
-      - ISOL_AUTH_SERVICE_REALM=${ISOL_AUTH_SERVICE_REALM}
-      - ISOL_AUTH_SERVICE_UI_CLIENT=${ISOL_AUTH_SERVICE_UI_CLIENT}
-      - ISOL_AUTH_SERVICE_EXTERNAL_HOST=${ISOL_AUTH_SERVICE_EXTERNAL_HOST}
-      - ISOL_AUTH_SERVICE_EXTERNAL_PORT=${ISOL_AUTH_SERVICE_EXTERNAL_PORT}
-      - ISOL_AUTH_SERVICE_EXTERNAL_PATH=${ISOL_AUTH_SERVICE_EXTERNAL_PATH}