diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index a99be69..214578e 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -41,6 +41,7 @@
     docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf_notifier:0.2-mcp0"
     ##
     docker_image_cockroachdb: "${_param:mcp_docker_registry}/mirantis/external/cockroach/cockroach:v2.1.1"
+    docker_image_cockroachdb_init: "${_param:mcp_docker_registry}/mirantis/external/atengler/cockroach-init/cockroach-init:v2.0.6"
     # keycloak
     docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
     docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
diff --git a/docker/swarm/stack/operations_api.yml b/docker/swarm/stack/operations_api.yml
index e4f4ebd..a584f37 100644
--- a/docker/swarm/stack/operations_api.yml
+++ b/docker/swarm/stack/operations_api.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     docker_operations_api_replicas: 1
-    operations_api_sqlalchemy_database_uri: "cockroachdb://oapi@cockroach-ui:26257/oapi"
+    operations_api_sqlalchemy_database_uri: "cockroachdb://oapi@cockroach-db-1:26257/oapi"
     operations_api_sqlalchemy_echo: "false"
     operations_api_flask_debug: "false"
     operations_api_bind_host: 0.0.0.0
@@ -52,18 +52,18 @@
                 - ${_param:haproxy_operations_api_exposed_port}:${_param:haproxy_operations_api_bind_port}
               volumes:
                 - /srv/volumes/operations_api/logs/:/var/log/operations_api
-            cockroach-ui:
-              image: ${_param:docker_image_cockroachdb}
-              ports:
-                - ${_param:haproxy_cockroachdb_ui_exposed_port}:${_param:haproxy_cockroachdb_ui_bind_port}
-              command: start --insecure
             cockroach-db-1:
-              image: cockroachdb/cockroach
-              command: start --insecure --join=cockroach-ui
-              depends_on:
-                - cockroach-ui
+              image: ${_param:docker_image_cockroachdb}
+              command: start --insecure
               volumes:
-                - /srv/volumes/cockroachdb/cockroach-db-1:/cockroach/cockroach-data
+              - /srv/volumes/cockroachdb/cockroach-db-1:/cockroach/cockroach-data
+            cockroach-db-2:
+              image: ${_param:docker_image_cockroachdb}
+              command: start --insecure --join=cockroach-db-1
+              depends_on:
+                - cockroach-db-1
+              volumes:
+                - /srv/volumes/cockroachdb/cockroach-db-2:/cockroach/cockroach-data
             operations-ui:
               environment:
                 REACT_APP_OPERATIONS_API_URL: 'http://${_param:cluster_public_host}:${_param:haproxy_operations_api_bind_port}'
@@ -75,10 +75,10 @@
                 - ${_param:haproxy_operations_ui_exposed_port}:${_param:haproxy_operations_ui_bind_port}
             cockroach-init:
               environment:
-                COCKROACH_HOST: cockroach-ui
+                COCKROACH_HOST: cockroach-db-1
                 DB_NAME: oapi
                 DB_USER: oapi
-              image: atengler/cockroach-init
+              image: ${_param:docker_image_cockroachdb_init}
               deploy:
                 restart_policy:
                   condition: on-failure