diff --git a/Makefile b/Makefile
index d334607fa25308f1ad4dbf9cd82557c4cbbf33fa..5fd388cde899a74a89a16875306c9c9cdebe37e7 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ build-frontend:
 build-clients:
 	bash ./.gitlab/swagger/generate.sh
 
-tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-broker-service tag-metadata-service tag-search-sync-agent tag-log-service
+tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-broker-service tag-metadata-service tag-search-sync-agent tag-log-service tag-search-db
 
 tag-analyse-service:
 	docker tag dbrepo-analyse-service:latest "dbrepo/analyse-service:${TAG}"
@@ -70,7 +70,7 @@ tag-log-service:
 	docker tag dbrepo-log-service:latest "dbrepo/log-service:${TAG}"
 	docker tag dbrepo-log-service:latest "${AZURE_REPO}/dbrepo/log-service:${TAG}"
 
-release: build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-broker-service release-metadata-service release-search-sync-agent release-log-service
+release: build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-broker-service release-metadata-service release-search-sync-agent release-log-service release-search-db
 
 release-analyse-service: tag-analyse-service
 	docker push "dbrepo/analyse-service:${TAG}"
diff --git a/docker-compose.yml b/docker-compose.yml
index 3bee756840367e429f5a0e9aa9c76efd4f9e4a54..0457ab413f712b840bead51e9b7f5d3e1e9528fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -351,34 +351,34 @@ services:
       dbrepo-search-db:
         condition: service_healthy
 
-  dbrepo-search-sync-agent:
-    restart: "no"
-    container_name: dbrepo-search-sync-agent
-    hostname: search-startup-agent
-    build: ./dbrepo-search-sync-agent
-    image: dbrepo-search-sync-agent
-    networks:
-      core:
-    environment:
-      METADATA_DB: ${METADATA_DB:-fda}
-      METADATA_HOST: ${METADATA_HOST:-metadata-db}
-      METADATA_JDBC_EXTRA_ARGS: ${METADATA_JDBC_EXTRA_ARGS:-}
-      METADATA_PASSWORD: ${METADATA_PASSWORD:-dbrepo}
-      METADATA_USERNAME: ${METADATA_USERNAME:-root}
-      SEARCH_USERNAME: ${SEARCH_USERNAME:-admin}
-      SEARCH_PASSWORD: ${SEARCH_PASSWORD:-admin}
-      LOG_LEVEL: ${LOG_LEVEL:-debug}
-    healthcheck:
-      test: wget -qO- localhost:9050/actuator/health/readiness | grep -q "UP" || exit 1
-      interval: 10s
-      timeout: 5s
-      retries: 12
-    depends_on:
-      dbrepo-metadata-db:
-        condition: service_healthy
-      dbrepo-search-db:
-        condition: service_started
-      dbrepo-authentication-service:
-        condition: service_healthy
-    logging:
-      driver: json-file
\ No newline at end of file
+#  dbrepo-search-sync-agent:
+#    restart: "no"
+#    container_name: dbrepo-search-sync-agent
+#    hostname: search-startup-agent
+#    build: ./dbrepo-search-sync-agent
+#    image: dbrepo-search-sync-agent
+#    networks:
+#      core:
+#    environment:
+#      METADATA_DB: ${METADATA_DB:-fda}
+#      METADATA_HOST: ${METADATA_HOST:-metadata-db}
+#      METADATA_JDBC_EXTRA_ARGS: ${METADATA_JDBC_EXTRA_ARGS:-}
+#      METADATA_PASSWORD: ${METADATA_PASSWORD:-dbrepo}
+#      METADATA_USERNAME: ${METADATA_USERNAME:-root}
+#      SEARCH_USERNAME: ${SEARCH_USERNAME:-admin}
+#      SEARCH_PASSWORD: ${SEARCH_PASSWORD:-admin}
+#      LOG_LEVEL: ${LOG_LEVEL:-debug}
+#    healthcheck:
+#      test: wget -qO- localhost:9050/actuator/health/readiness | grep -q "UP" || exit 1
+#      interval: 10s
+#      timeout: 5s
+#      retries: 12
+#    depends_on:
+#      dbrepo-metadata-db:
+#        condition: service_healthy
+#      dbrepo-search-db:
+#        condition: service_started
+#      dbrepo-authentication-service:
+#        condition: service_healthy
+#    logging:
+#      driver: json-file
\ No newline at end of file