diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 7a818e0..d7c290c 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -34,3 +34,5 @@
     docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:${_param:mcp_version}"
     docker_image_remote_collector: "${_param:mcp_docker_registry}/openstack-docker/heka:${_param:mcp_version}"
     docker_image_remote_storage_adapter: "${_param:mcp_docker_registry}/openstack-docker/remote_storage_adapter:${_param:mcp_version}"
+    ##
+    docker_image_cockroachdb: "${_param:mcp_docker_registry}/mirantis/external/cockroach:v2.1.1"
diff --git a/docker/swarm/stack/operations_api.yml b/docker/swarm/stack/operations_api.yml
index dd74899..e4f4ebd 100644
--- a/docker/swarm/stack/operations_api.yml
+++ b/docker/swarm/stack/operations_api.yml
@@ -1,8 +1,6 @@
 parameters:
   _param:
     docker_operations_api_replicas: 1
-    # FIXME: move cockroach image to defaults once it is uploaded to artifactory with proper tag
-    docker_image_cockroachdb: cockroachdb/cockroach:latest
     operations_api_sqlalchemy_database_uri: "cockroachdb://oapi@cockroach-ui:26257/oapi"
     operations_api_sqlalchemy_echo: "false"
     operations_api_flask_debug: "false"