@@ -40,13 +40,9 @@ services:
       INITIAL_ROOT_PASSWORD: ${INITIAL_ROOT_PASSWORD}
       INITIAL_ROOT_MAIL: ${INITIAL_ROOT_MAIL}
       INITIAL_RUNTIME_TOKEN: ${INITIAL_RUNTIME_TOKEN}
+      SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-web.yml
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
-        exec bin/docker-entrypoint ./bin/rails server
-      "
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "curl --fail http://localhost:3000/health/liveness"]
@@ -63,11 +59,12 @@ services:
         condition: service_healthy
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
-        exec bin/docker-entrypoint bundle exec good_job
-      "
+    environment:
+      SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-background.yml
+    command:
+      - bundle
+      - exec
+      - good_job
     restart: unless-stopped
     profiles:
       - ide
@@ -79,11 +76,23 @@ services:
         condition: service_healthy
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
-        exec bin/docker-entrypoint ./bin/grpc_server
-      "
+    environment:
+      SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-grpc.yml
+    command:
+      - bin/grpc_server
+    restart: unless-stopped
+    profiles:
+      - ide
+
+  sagittarius-gateway:
+    image: ${IMAGE_REGISTRY}/sagittarius-gateway:${IMAGE_TAG}
+    depends_on:
+      sagittarius-grpc:
+        condition: service_started
+    volumes:
+      - generated-configs:/tmp/generated-configs:ro
+    environment:
+      GATEWAY_CONFIG_PATH: /tmp/generated-configs/sagittarius-gateway.gateway.yml
     restart: unless-stopped
     profiles:
       - ide
@@ -95,23 +104,44 @@ services:
         condition: service_healthy
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
-        exec bin/docker-entrypoint bundle exec puma config.cable.ru
-      "
+    environment:
+      SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-cable.yml
+    command:
+      - bundle
+      - exec
+      - puma
+      - config.cable.ru
     restart: unless-stopped
     profiles:
       - ide
 
   sculptor:
     image: ${IMAGE_REGISTRY}/sculptor:${IMAGE_TAG}-${IMAGE_EDITION}
     restart: unless-stopped
+    environment:
+      OPENTELEMETRY_ENABLED: ${OPENTELEMETRY_ENABLED:-false}
+      OTEL_SERVICE_NAME: ${OPENTELEMETRY_SERVICE_NAME_SCULPTOR}
+      OTEL_LOGS_ENDPOINT: ${OPENTELEMETRY_LOGS_HTTP_ENDPOINT}
+      OTEL_METRICS_ENDPOINT: ${OPENTELEMETRY_METRICS_HTTP_ENDPOINT}
+      OTEL_TRACES_ENDPOINT: ${OPENTELEMETRY_TRACES_HTTP_ENDPOINT}
+      NEXT_PUBLIC_OTEL_SERVICE_NAME: ${OPENTELEMETRY_SERVICE_NAME_SCULPTOR_CLIENTSIDE}
+      NEXT_PUBLIC_OTEL_LOGS_ENDPOINT: ${OPENTELEMETRY_LOGS_CLIENTSIDE_HTTP_ENDPOINT}
+      NEXT_PUBLIC_OTEL_METRICS_ENDPOINT: ${OPENTELEMETRY_METRICS_CLIENTSIDE_HTTP_ENDPOINT}
+      NEXT_PUBLIC_OTEL_TRACES_ENDPOINT: ${OPENTELEMETRY_TRACES_CLIENTSIDE_HTTP_ENDPOINT}
+    entrypoint: |
+      sh -c "
+        if [ \"$$OPENTELEMETRY_ENABLED\" != 'true' ]; then
+          echo 'UNSET OTEL'
+          unset OTEL_SERVICE_NAME OTEL_LOGS_ENDPOINT OTEL_METRICS_ENDPOINT OTEL_TRACES_ENDPOINT
+          unset NEXT_PUBLIC_OTEL_SERVICE_NAME NEXT_PUBLIC_OTEL_LOGS_ENDPOINT NEXT_PUBLIC_OTEL_METRICS_ENDPOINT NEXT_PUBLIC_OTEL_TRACES_ENDPOINT
+        fi
+        exec npm run start
+      "
     profiles:
       - ide
 
   velorum:
-    image: ${IMAGE_REGISTRY}/velorum:${IMAGE_TAG}
+    image: ${IMAGE_REGISTRY}/velorum:${IMAGE_TAG}-${IMAGE_EDITION}
     depends_on:
       config-generator:
         condition: service_completed_successfully
@@ -130,15 +160,15 @@ services:
       - ide_velorum
 
   nginx:
-    image: nginx:1.31.1-alpine-slim
+    image: nginx:1.31.3-alpine-otel
     depends_on:
       config-generator:
         condition: service_completed_successfully
       sagittarius-rails-web:
         condition: service_started
       sagittarius-rails-cable:
         condition: service_started
-      sagittarius-grpc:
+      sagittarius-gateway:
         condition: service_started
       sculptor:
         condition: service_started
@@ -148,6 +178,10 @@ services:
     entrypoint: |
       sh -c "
         cp /tmp/generated-configs/nginx.default.conf /etc/nginx/conf.d/default.conf
+        if [ -s /tmp/generated-configs/nginx.otel.conf ]; then
+          sed -i '1i load_module modules/ngx_otel_module.so;' /etc/nginx/nginx.conf
+          cp /tmp/generated-configs/nginx.otel.conf /etc/nginx/conf.d/otel.conf
+        fi
         nginx -t
         exec nginx -g 'daemon off;'
       "
@@ -159,7 +193,7 @@ services:
       - ide
 
   nats:
-    image: nats:2.14.1
+    image: nats:2.14.4
     command:
       - -js
     restart: unless-stopped
@@ -174,23 +208,16 @@ services:
         condition: service_started
     image: ${IMAGE_REGISTRY}/aquila:${IMAGE_TAG}
     environment:
-      MODE: dynamic
-      NATS_URL: nats://nats:4222
-      NATS_BUCKET: 'flow_store'
-      GRPC_HOST: 0.0.0.0
-      SAGITTARIUS_URL: "${AQUILA_SAGITTARIUS_URL}"
-      RUNTIME_TOKEN: "${AQUILA_SAGITTARIUS_TOKEN}"
-      SAGITTARIUS_UNARY_RPC_TIMEOUT_SECS: "${SAGITTARIUS_UNARY_RPC_TIMEOUT_SECS}"
+      AQUILA_CONFIG_PATH: /tmp/generated-configs/aquila.aquila.yml
+      AQUILA_SERVICE_CONFIG_PATH: /tmp/generated-configs/aquila.service.configuration.json
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/aquila.service.configuration.json /service.configuration.json
-        exec /aquila
-      "
     restart: unless-stopped
     profiles:
       - runtime
+    networks:
+      - default
+      - aquila
 
   taurus:
     depends_on:
@@ -201,54 +228,43 @@ services:
       MODE: dynamic
       AQUILA_URL: 'http://aquila:8081'
       NATS_URL: nats://nats:4222
-      DEFINITION_PATH: '/definitions'
       AQUILA_TOKEN: "${TAURUS_AQUILA_TOKEN}"
       AQUILA_GRPC_CONNECT_TIMEOUT_SECS: "${AQUILA_GRPC_CONNECT_TIMEOUT_SECS}"
       AQUILA_GRPC_REQUEST_TIMEOUT_SECS: "${AQUILA_GRPC_REQUEST_TIMEOUT_SECS}"
     restart: unless-stopped
     profiles:
       - runtime
 
-  draco-rest:
+  rest-action:
     depends_on:
-      - nats
-    image: ${IMAGE_REGISTRY}/draco:${IMAGE_TAG}-rest
+      - aquila
+    image: ${ACTION_IMAGE_REGISTRY}/rest-action:${ACTION_IMAGE_TAG}
     environment:
-      MODE: dynamic
-      AQUILA_URL: 'http://aquila:8081'
-      NATS_URL: nats://nats:4222
-      NATS_BUCKET: 'flow_store'
-      DEFINITION_PATH: '/definitions'
+      HERCULES_AQUILA_URL: 'http://aquila:8081'
+      HERCULES_AUTH_TOKEN: "${AQUILA_ACTION_REST_TOKEN}"
       HTTP_SERVER_PORT: 8084
       HTTP_SERVER_HOST: "0.0.0.0"
-      EXTERNAL_HTTP_SERVER_PORT: "${DRACO_REST_PORT}"
-      EXTERNAL_HTTP_SERVER_HOST: "${DRACO_REST_HOST}"
-      AQUILA_TOKEN: "${DRACO_REST_AQUILA_TOKEN}"
-      AQUILA_GRPC_CONNECT_TIMEOUT_SECS: "${AQUILA_GRPC_CONNECT_TIMEOUT_SECS}"
-      AQUILA_GRPC_REQUEST_TIMEOUT_SECS: "${AQUILA_GRPC_REQUEST_TIMEOUT_SECS}"
     ports:
-      - "${DRACO_REST_PORT}:8084"
+      - "${REST_ACTION_PORT}:8084"
     restart: unless-stopped
     profiles:
       - runtime
 
-  draco-cron:
+  cron-action:
     depends_on:
-      - nats
-    image: ${IMAGE_REGISTRY}/draco:${IMAGE_TAG}-cron
+      - aquila
+    image: ${ACTION_IMAGE_REGISTRY}/cron-action:${ACTION_IMAGE_TAG}
     environment:
-      MODE: dynamic
-      AQUILA_URL: 'http://aquila:8081'
-      NATS_URL: nats://nats:4222
-      NATS_BUCKET: 'flow_store'
-      DEFINITION_PATH: '/definitions'
-      AQUILA_TOKEN: "${DRACO_CRON_AQUILA_TOKEN}"
-      AQUILA_GRPC_CONNECT_TIMEOUT_SECS: "${AQUILA_GRPC_CONNECT_TIMEOUT_SECS}"
-      AQUILA_GRPC_REQUEST_TIMEOUT_SECS: "${AQUILA_GRPC_REQUEST_TIMEOUT_SECS}"
+      HERCULES_AQUILA_URL: 'http://aquila:8081'
+      HERCULES_AUTH_TOKEN: "${AQUILA_ACTION_CRON_TOKEN}"
     restart: unless-stopped
     profiles:
       - runtime
 
 volumes:
   generated-configs:
   postgres-data:
+
+networks:
+  aquila:
+    name: codezero-aquila