diff --git a/dbrepo-container-service/Dockerfile b/dbrepo-container-service/Dockerfile
index 3495a8bfbb6ef1d20acf3597e3879ecd494240d3..9e8c839383c3441553d11fe8aeb473133f7e3b82 100644
--- a/dbrepo-container-service/Dockerfile
+++ b/dbrepo-container-service/Dockerfile
@@ -30,6 +30,8 @@ ENV METADATA_USERNAME=root
 ENV METADATA_PASSWORD=dbrepo
 ENV BROKER_USERNAME=fda
 ENV BROKER_PASSWORD=fda
+ENV ELASTIC_USERNAME=elastic
+ENV ELASTIC_PASSWORD=elastic
 ENV SHARED_FILESYSTEM=/tmp
 ENV USER_NETWORK=userdb
 ENV LOG_LEVEL=debug
diff --git a/dbrepo-container-service/pom.xml b/dbrepo-container-service/pom.xml
index b972c5fa5f49a214084b0a591d31ca93416b5d6e..af6a4ebfd8ae611ab48bb19839fd59f593100ae8 100644
--- a/dbrepo-container-service/pom.xml
+++ b/dbrepo-container-service/pom.xml
@@ -88,10 +88,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-elasticsearch</artifactId>
-        </dependency>
         <!-- Entity and API -->
         <dependency>
             <groupId>at.tuwien</groupId>
diff --git a/dbrepo-container-service/rest-service/src/main/java/at/tuwien/DbrepoContainerManagingApplication.java b/dbrepo-container-service/rest-service/src/main/java/at/tuwien/DbrepoContainerManagingApplication.java
index 816eac97eb01f48618670e9c0b27eb6e47ca18b9..7ef30669bce222658b191aa5a5dd5f05e2cb811c 100644
--- a/dbrepo-container-service/rest-service/src/main/java/at/tuwien/DbrepoContainerManagingApplication.java
+++ b/dbrepo-container-service/rest-service/src/main/java/at/tuwien/DbrepoContainerManagingApplication.java
@@ -3,7 +3,6 @@ package at.tuwien;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -11,7 +10,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableTransactionManagement
-@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.elastic"})
 @EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"})
 @EntityScan(basePackages = {"at.tuwien.entities"})
 public class DbrepoContainerManagingApplication {
diff --git a/dbrepo-container-service/rest-service/src/main/resources/application-local.yml b/dbrepo-container-service/rest-service/src/main/resources/application-local.yml
index 16147161785a7dc27dca23df5963b6d129a8fc10..9760a7ba9def6da76170e5f68bdb68903ec12d13 100644
--- a/dbrepo-container-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-container-service/rest-service/src/main/resources/application-local.yml
@@ -27,6 +27,10 @@ spring:
     virtual-host: dbrepo
     username: fda
     password: fda
+  elasticsearch:
+    password: elastic
+    username: elastic
+    uris: http://localhost:9200
 management.endpoints.web.exposure.include: health,info,prometheus
 springdoc.swagger-ui.enabled: true
 server:
diff --git a/dbrepo-container-service/rest-service/src/main/resources/application.yml b/dbrepo-container-service/rest-service/src/main/resources/application.yml
index 51a75828390349483877afca20c08ed4cc90109b..514c45bb328236d8f940331d051c0c2c2faf9ade 100644
--- a/dbrepo-container-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-container-service/rest-service/src/main/resources/application.yml
@@ -27,6 +27,10 @@ spring:
     virtual-host: dbrepo
     username: "${BROKER_USERNAME}"
     password: "${BROKER_PASSWORD}"
+  elasticsearch:
+    password: "${ELASTIC_PASSWORD}"
+    username: "${ELASTIC_USERNAME}"
+    uris: http://search-service:9200
 management.endpoints.web.exposure.include: health,info,prometheus
 springdoc.swagger-ui.enabled: true
 server:
diff --git a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3cfe18382347d7472f16ec9d5c4de5d618743bdd
--- /dev/null
+++ b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -0,0 +1,43 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class ActuatorComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void actuatorInfo_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/info"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void actuatorStatus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/health"));
+    }
+
+    @Test
+    public void actuatorPrometheus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/prometheus"));
+    }
+
+}
diff --git a/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c68901e8871dd03803f4ffce081a073016ce995
--- /dev/null
+++ b/dbrepo-container-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -0,0 +1,33 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class SwaggerComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void swaggerUi_succeeds() throws Exception {
+        this.mockMvc.perform(get("/swagger-ui/index.html"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+}
diff --git a/dbrepo-container-service/services/src/main/java/at/tuwien/repository/elastic/DatabaseRepository.java b/dbrepo-container-service/services/src/main/java/at/tuwien/repository/elastic/DatabaseRepository.java
deleted file mode 100644
index aa60a6dbbcdd124de8a38c4098ee43c7115df16f..0000000000000000000000000000000000000000
--- a/dbrepo-container-service/services/src/main/java/at/tuwien/repository/elastic/DatabaseRepository.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package at.tuwien.repository.elastic;
-
-import at.tuwien.entities.database.Database;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository(value = "ElasticDatabaseService")
-public interface DatabaseRepository extends ElasticsearchRepository<Database, Long> {
-}
\ No newline at end of file
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cab709d9c6692a9e2c0cc236520751659ec4306d
--- /dev/null
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -0,0 +1,52 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class ActuatorComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private Channel channel;
+
+    @MockBean
+    private IndexConfig indexConfig;
+
+    @Test
+    public void actuatorInfo_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/info"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void actuatorStatus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/health"));
+    }
+
+    @Test
+    public void actuatorPrometheus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/prometheus"));
+    }
+
+}
diff --git a/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f448ca36e90e3d81aac0e68ddaa7304fbeb5af9
--- /dev/null
+++ b/dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -0,0 +1,42 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class SwaggerComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private Channel channel;
+
+    @MockBean
+    private IndexConfig indexConfig;
+
+    @Test
+    public void swaggerUi_succeeds() throws Exception {
+        this.mockMvc.perform(get("/swagger-ui/index.html"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+}
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3677c7f0451b17bc696a779ff759066bfd57832d
--- /dev/null
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -0,0 +1,48 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexInitializer;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class ActuatorComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private IndexInitializer indexConfig;
+
+    @Test
+    public void actuatorInfo_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/info"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void actuatorStatus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/health"));
+    }
+
+    @Test
+    public void actuatorPrometheus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/prometheus"));
+    }
+
+}
diff --git a/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..0caa396455da3088708d66147dfe1afd35ae981a
--- /dev/null
+++ b/dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -0,0 +1,38 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexInitializer;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class SwaggerComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private IndexInitializer indexConfig;
+
+    @Test
+    public void swaggerUi_succeeds() throws Exception {
+        this.mockMvc.perform(get("/swagger-ui/index.html"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+}
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cab709d9c6692a9e2c0cc236520751659ec4306d
--- /dev/null
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -0,0 +1,52 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class ActuatorComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private Channel channel;
+
+    @MockBean
+    private IndexConfig indexConfig;
+
+    @Test
+    public void actuatorInfo_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/info"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void actuatorStatus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/health"));
+    }
+
+    @Test
+    public void actuatorPrometheus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/prometheus"));
+    }
+
+}
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f448ca36e90e3d81aac0e68ddaa7304fbeb5af9
--- /dev/null
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -0,0 +1,42 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class SwaggerComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private Channel channel;
+
+    @MockBean
+    private IndexConfig indexConfig;
+
+    @Test
+    public void swaggerUi_succeeds() throws Exception {
+        this.mockMvc.perform(get("/swagger-ui/index.html"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+}
diff --git a/dbrepo-semantics-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-semantics-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3cfe18382347d7472f16ec9d5c4de5d618743bdd
--- /dev/null
+++ b/dbrepo-semantics-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -0,0 +1,43 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class ActuatorComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void actuatorInfo_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/info"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void actuatorStatus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/health"));
+    }
+
+    @Test
+    public void actuatorPrometheus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/prometheus"));
+    }
+
+}
diff --git a/dbrepo-semantics-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-semantics-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7c68901e8871dd03803f4ffce081a073016ce995
--- /dev/null
+++ b/dbrepo-semantics-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -0,0 +1,33 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class SwaggerComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void swaggerUi_succeeds() throws Exception {
+        this.mockMvc.perform(get("/swagger-ui/index.html"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+}
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cab709d9c6692a9e2c0cc236520751659ec4306d
--- /dev/null
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -0,0 +1,52 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class ActuatorComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private Channel channel;
+
+    @MockBean
+    private IndexConfig indexConfig;
+
+    @Test
+    public void actuatorInfo_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/info"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void actuatorStatus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/health"));
+    }
+
+    @Test
+    public void actuatorPrometheus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/prometheus"));
+    }
+
+}
diff --git a/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f448ca36e90e3d81aac0e68ddaa7304fbeb5af9
--- /dev/null
+++ b/dbrepo-table-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -0,0 +1,42 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class SwaggerComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private Channel channel;
+
+    @MockBean
+    private IndexConfig indexConfig;
+
+    @Test
+    public void swaggerUi_succeeds() throws Exception {
+        this.mockMvc.perform(get("/swagger-ui/index.html"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+}
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..041e444616f232b957b5d0f756382b760f7df36a
--- /dev/null
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java
@@ -0,0 +1,48 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class ActuatorComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private Channel channel;
+
+    @Test
+    public void actuatorInfo_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/info"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void actuatorStatus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/health"));
+    }
+
+    @Test
+    public void actuatorPrometheus_succeeds() throws Exception {
+        this.mockMvc.perform(get("/actuator/prometheus"));
+    }
+
+}
diff --git a/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..431a54052c11bc0eb4422c195e7242b829de65ce
--- /dev/null
+++ b/dbrepo-user-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java
@@ -0,0 +1,38 @@
+package at.tuwien.endpoint;
+
+import at.tuwien.BaseUnitTest;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+public class SwaggerComponentTest extends BaseUnitTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private Channel channel;
+
+    @Test
+    public void swaggerUi_succeeds() throws Exception {
+        this.mockMvc.perform(get("/swagger-ui/index.html"))
+                .andDo(print())
+                .andExpect(status().isOk());
+    }
+
+}
diff --git a/dbrepo.conf b/dbrepo.conf
index bd063fbebcdc85914ac250f6f090438a0a99c99a..54bcc8385543612c83873588f03c211a8e3be5ac 100644
--- a/dbrepo.conf
+++ b/dbrepo.conf
@@ -47,7 +47,7 @@ upstream semantics {
 }
 
 upstream search {
-    server search-service:9200;
+    server search-db:9200;
 }
 
 upstream ui {