diff --git a/.env.unix.example b/.env.unix.example
index b89114ae28eead06c12b3d12f842a7254d9a2518..9743a6453910594a958be5fb2f7d6c9d6754d582 100644
--- a/.env.unix.example
+++ b/.env.unix.example
@@ -6,7 +6,6 @@ BROKER_PASSWORD=fda
 BROKER_CONSUMERS=2
 WEBSITE=http://example.com
 TOKEN_MAX=5
-LOGO=/path/to/logo.png
 MAIL_FROM="Database Repository <noreply@example.com>"
 MAIL_REPLY_TO="Admin <somebody@example.com>"
 MAIL_VERIFY=false
@@ -19,3 +18,4 @@ JWT_SECRET=secret
 JWT_EXPIRATION=86400000
 EUREKA_SERVER=http://discovery-service:9090/eureka/
 SHARED_FILESYSTEM=/tmp
+LOG_LEVEL=trace # error, warning, info, debug, trace
diff --git a/.env.win.example b/.env.win.example
index ebf5810583f0fbf66266d7cfce52841da2ad30f1..2cb7c72b6a673c2dc43aad14bfdb3830f928268c 100644
--- a/.env.win.example
+++ b/.env.win.example
@@ -6,7 +6,6 @@ BROKER_PASSWORD=fda
 BROKER_CONSUMERS=2
 WEBSITE=http://example.com
 TOKEN_MAX=5
-LOGO=/path/to/logo.png
 MAIL_FROM="Database Repository <noreply@example.com>"
 MAIL_REPLY_TO="Admin <somebody@example.com>"
 MAIL_VERIFY=false
@@ -19,3 +18,4 @@ JWT_SECRET=secret
 JWT_EXPIRATION=86400000
 EUREKA_SERVER=http://discovery-service:9090/eureka/
 SHARED_FILESYSTEM=C:\tmp
+LOG_LEVEL=trace # error, warning, info, debug, trace
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25e8ebe5c18596f784d0428d45e51eb6ee991b07..ed28a72cdc498bfa54f700a2c6d52c4cea308763 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ image: "docker/compose:latest"
 stages:
   - build-backend
   - build-frontend
+  - test-backend
   - build-docker
   - release
 
@@ -90,6 +91,69 @@ build-backend-metadata:
   script:
     - "make build-backend-metadata"
 
+test-backend-authentication:
+  stage: test-backend
+  needs:
+    - build-backend-authentication
+  script:
+    - "make test-authentication-service"
+
+test-backend-identifier:
+  stage: test-backend
+  needs:
+    - build-backend-authentication
+  script:
+    - "make test-identifier-service"
+
+test-backend-container:
+  stage: test-backend
+  needs:
+    - build-backend-container
+  script:
+    - "make test-container-service"
+
+test-backend-database:
+  stage: test-backend
+  needs:
+    - build-backend-database
+  script:
+    - "make test-database-service"
+
+test-backend-discovery:
+  stage: test-backend
+  needs:
+    - build-backend-discovery
+  script:
+    - "make test-discovery-service"
+
+test-backend-query:
+  stage: test-backend
+  needs:
+    - build-backend-query
+  script:
+    - "make test-query-service"
+
+test-backend-table:
+  stage: test-backend
+  needs:
+    - build-backend-table
+  script:
+    - "make test-table-service"
+
+test-backend-metadata:
+  stage: test-backend
+  needs:
+    - build-backend-metadata
+  script:
+    - "make test-metadata-service"
+
+test-backend-gateway:
+  stage: test-backend
+  needs:
+    - build-backend-gateway
+  script:
+    - "make test-gateway-service"
+
 build-docker:
   stage: build-docker
   needs:
diff --git a/Makefile b/Makefile
index e70e3e7e5f5cabd61ba5b320ecb19a0c6f06e284..1de82865aa2cd00d37ad3879f346d41ab7cab89b 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ pull-metadata:
 
 test-backend: test-authentication-service test-container-service test-database-service test-discovery-service test-gateway-service test-query-service test-table-service test-identifier-service test-metadata-service
 
-test-backend-auth:
+test-authentication-service:
 	mvn -f ./fda-authentication-service/pom.xml clean test verify
 
 test-identifier-service:
diff --git a/fda-authentication-service/Dockerfile b/fda-authentication-service/Dockerfile
index 6aad7a07c740c13bb6532b8bdf2fcc0e016f6804..42dece92fa455e366583286303ed1a3349b68b54 100644
--- a/fda-authentication-service/Dockerfile
+++ b/fda-authentication-service/Dockerfile
@@ -39,6 +39,7 @@ ENV SMTP_HOST=""
 ENV SMTP_PORT=""
 ENV SMTP_USERNAME=""
 ENV SMTP_PASSWORD=""
+ENV LOG_LEVEL=debug
 
 VOLUME /tmp
 
@@ -47,8 +48,8 @@ RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./authentication-service.jar
 
 EXPOSE 9097
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./authentication-service.jar"]
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
index 3bf442138dc8ee002c903ae9b904cb1e30cbff8a..441da8934f799d8129ff840e743b057b3a8eb522 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
@@ -37,7 +37,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: authentication-service
diff --git a/fda-authentication-service/rest-service/src/main/resources/application.yml b/fda-authentication-service/rest-service/src/main/resources/application.yml
index 91bb7331ae8c2c5b81bae150fc962bd59053f0fc..7b1f6a1cc60912f8fb33bf699302fb21608011bc 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application.yml
@@ -40,7 +40,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: authentication-service
diff --git a/fda-container-service/Dockerfile b/fda-container-service/Dockerfile
index 3a7b9d77887075f54d02852b1a78ce3a1e377bce..3bea5887a324f63858bde43bceb1b4c7b48e7627 100644
--- a/fda-container-service/Dockerfile
+++ b/fda-container-service/Dockerfile
@@ -28,14 +28,15 @@ ENV BROKER_USERNAME=fda
 ENV BROKER_PASSWORD=fda
 ENV SHARED_FILESYSTEM=/tmp
 ENV USER_NETWORK=userdb
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./container-service.jar
 
 EXPOSE 9091
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./container-service.jar"]
diff --git a/fda-container-service/rest-service/src/main/resources/application-docker.yml b/fda-container-service/rest-service/src/main/resources/application-docker.yml
index 9ec1d41c3bd843134e439cd16a82ff698e894b67..f5efc5076a0c0d086ccbea8632ba36db2b87ff08 100644
--- a/fda-container-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-docker.yml
@@ -27,7 +27,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: container-service
diff --git a/fda-container-service/rest-service/src/main/resources/application.yml b/fda-container-service/rest-service/src/main/resources/application.yml
index 11a60e0af8b666ebe595539a145a8a7829c4162a..1225af6d05f77fd71ea38e49e13b7655dd156706 100644
--- a/fda-container-service/rest-service/src/main/resources/application.yml
+++ b/fda-container-service/rest-service/src/main/resources/application.yml
@@ -27,7 +27,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: container-service
diff --git a/fda-database-service/Dockerfile b/fda-database-service/Dockerfile
index 831da8e400f4c1f6ebec0eb21ceee3a12d693109..a6f4b9a8f9d5a0576502feb69b024c0812a574f7 100644
--- a/fda-database-service/Dockerfile
+++ b/fda-database-service/Dockerfile
@@ -30,14 +30,15 @@ ENV SEARCH_ENDPOINT=search-service
 ENV SEARCH_USERNAME=elastic
 ENV SEARCH_PASSWORD=elastic
 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./database-service.jar
 
 EXPOSE 9092
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./database-service.jar"]
diff --git a/fda-database-service/rest-service/src/main/resources/application-docker.yml b/fda-database-service/rest-service/src/main/resources/application-docker.yml
index 6ba79bcfcfb3a163111488800d76bbc7151e50e7..046b4830afbfbae7e0ede200a87ddba29f3903a4 100644
--- a/fda-database-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-docker.yml
@@ -30,7 +30,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: database-service
diff --git a/fda-database-service/rest-service/src/main/resources/application.yml b/fda-database-service/rest-service/src/main/resources/application.yml
index 625d22eb410e33f11920aac532160967361e9734..748dcc16681f9222256deabbd9b5603ff488c435 100644
--- a/fda-database-service/rest-service/src/main/resources/application.yml
+++ b/fda-database-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: database-service
diff --git a/fda-discovery-service/Dockerfile b/fda-discovery-service/Dockerfile
index e50ca904bbd3a54e754bea718702f10a24c77cbc..0f8441c290d27970022ae48633fe3ea8160127e3 100644
--- a/fda-discovery-service/Dockerfile
+++ b/fda-discovery-service/Dockerfile
@@ -18,14 +18,15 @@ FROM openjdk:11-jre-slim as runtime
 ENV METADATA_DB=fda
 ENV METADATA_USERNAME=postgres
 ENV METADATA_PASSWORD=postgres
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./discovery/target/discovery-*.jar ./discovery.jar
+COPY --from=build ./discovery/target/discovery-*.jar ./discovery-service.jar
 
 EXPOSE 9090
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./discovery.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./discovery-service.jar"]
diff --git a/fda-discovery-service/discovery/src/main/resources/application-docker.yml b/fda-discovery-service/discovery/src/main/resources/application-docker.yml
index e02960ca685031631a9bd17f23b530dca5e78cc0..074b27b10c189f663240f6dae5261fd60f77f675 100644
--- a/fda-discovery-service/discovery/src/main/resources/application-docker.yml
+++ b/fda-discovery-service/discovery/src/main/resources/application-docker.yml
@@ -22,7 +22,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   eureka.client.register-with-eureka: false
diff --git a/fda-discovery-service/discovery/src/main/resources/application.yml b/fda-discovery-service/discovery/src/main/resources/application.yml
index c0aef96960ea655f04da9473ed9630226c7cd593..6cd73409b3a6b12da0ea863868c1067dd55b4021 100644
--- a/fda-discovery-service/discovery/src/main/resources/application.yml
+++ b/fda-discovery-service/discovery/src/main/resources/application.yml
@@ -22,7 +22,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   eureka.client.register-with-eureka: false
diff --git a/fda-gateway-service/Dockerfile b/fda-gateway-service/Dockerfile
index c5e68eaf20381290cedddbdadadd39cdd6599254..abc5835089880e6bf474cb7bdb05cd8759bdb7fe 100644
--- a/fda-gateway-service/Dockerfile
+++ b/fda-gateway-service/Dockerfile
@@ -19,14 +19,15 @@ ENV METADATA_DB=fda
 ENV METADATA_USERNAME=postgres
 ENV METADATA_PASSWORD=postgres
 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./gateway/target/gateway-*.jar ./gateway.jar
+COPY --from=build ./gateway/target/gateway-*.jar ./gateway-service.jar
 
 EXPOSE 9095
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./gateway.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./gateway-service.jar"]
\ No newline at end of file
diff --git a/fda-gateway-service/gateway/src/main/resources/application-docker.yml b/fda-gateway-service/gateway/src/main/resources/application-docker.yml
index 621804ff53e30751c6f6352a9d7bc59eda70694d..2bb501fcb03051990717eb200e8e9ba7bc9dc5b4 100644
--- a/fda-gateway-service/gateway/src/main/resources/application-docker.yml
+++ b/fda-gateway-service/gateway/src/main/resources/application-docker.yml
@@ -23,7 +23,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: discovery-service
diff --git a/fda-gateway-service/gateway/src/main/resources/application.yml b/fda-gateway-service/gateway/src/main/resources/application.yml
index 621804ff53e30751c6f6352a9d7bc59eda70694d..2bb501fcb03051990717eb200e8e9ba7bc9dc5b4 100644
--- a/fda-gateway-service/gateway/src/main/resources/application.yml
+++ b/fda-gateway-service/gateway/src/main/resources/application.yml
@@ -23,7 +23,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: discovery-service
diff --git a/fda-identifier-service/Dockerfile b/fda-identifier-service/Dockerfile
index 6637e5178eb9c1c9a94881065ff1127a5ad90a95..3db7b8b6f7ed57059a2f478185cb9526ce100a78 100644
--- a/fda-identifier-service/Dockerfile
+++ b/fda-identifier-service/Dockerfile
@@ -27,14 +27,15 @@ ENV METADATA_USERNAME=postgres
 ENV METADATA_PASSWORD=postgres
 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
 ENV WEBSITE=http://localhost:3000
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./identifier-service.jar
 
 EXPOSE 9096
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./identifier-service.jar"]
diff --git a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
index 25b6a277be4a1bba608336ef79a6f3bf116f2343..08df9cacc9bc159841e256e2157f0ae3ee273a77 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
@@ -26,7 +26,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: identifier-service
diff --git a/fda-identifier-service/rest-service/src/main/resources/application.yml b/fda-identifier-service/rest-service/src/main/resources/application.yml
index f7ca452326ab62b250151fdfc5adcd25c7447def..f9a20af4033586bdc9826ffe8c0d8ef658b6cea8 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application.yml
@@ -26,7 +26,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: identifier-service
diff --git a/fda-metadata-service/Dockerfile b/fda-metadata-service/Dockerfile
index a2b62e9d9c42416d5b039375670f005cd763e74d..a727f81379c3113dbca4ab6d5dc2662547d2bc71 100644
--- a/fda-metadata-service/Dockerfile
+++ b/fda-metadata-service/Dockerfile
@@ -32,14 +32,15 @@ ENV ADMIN_MAIL="noreply@example.com"
 ENV EARLIEST_DATESTAMP="2022-09-17T18:23:00Z"
 ENV DELETED_RECORD=persistent
 ENV GRANULARITY="YYYY-MM-DDThh:mm:ssZ"
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./metadata-service.jar
 
 EXPOSE 9090
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./metadata-service.jar"]
diff --git a/fda-metadata-service/rest-service/src/main/resources/application-docker.yml b/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
index fe79ce9d7913ea49e1961ff27ef9496371c9ec39..3ec8cd50702086f9a6a51986ce76a806826d60b1 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
@@ -25,7 +25,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: metadata-service
diff --git a/fda-metadata-service/rest-service/src/main/resources/application.yml b/fda-metadata-service/rest-service/src/main/resources/application.yml
index 9c26043e2c2916e45bef9a1fbb5e42bc99c83f30..307ead383f2ca7976501407f29fb6a6ee6efdee4 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application.yml
@@ -29,7 +29,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: metadata-service
diff --git a/fda-query-service/Dockerfile b/fda-query-service/Dockerfile
index b6acf3862e7ee791d99fc69b3a4fc2b2d4eac8a0..b2dac0fa1813fdca86d8cf4ee3e9bcf86008fb80 100644
--- a/fda-query-service/Dockerfile
+++ b/fda-query-service/Dockerfile
@@ -30,14 +30,15 @@ ENV BROKER_PASSWORD=fda
 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
 ENV SHARED_FILESYSTEM=/tmp
 ENV BROKER_CONSUMERS=2
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./query-service.jar
 
 EXPOSE 9093
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest-service.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./query-service.jar"]
diff --git a/fda-query-service/rest-service/src/main/resources/application-docker.yml b/fda-query-service/rest-service/src/main/resources/application-docker.yml
index beec8183b3a742f25fe71424e3f5fb98d9b6244f..933074053eb3c0244e53045264c5d54f01e3077a 100644
--- a/fda-query-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-query-service/rest-service/src/main/resources/application-docker.yml
@@ -30,7 +30,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: query-service
diff --git a/fda-query-service/rest-service/src/main/resources/application.yml b/fda-query-service/rest-service/src/main/resources/application.yml
index b5eecf060ba0871d4724ecb7452ef19549dd3c2b..4139a27347632709ba0a630e4c3151e0505e2af9 100644
--- a/fda-query-service/rest-service/src/main/resources/application.yml
+++ b/fda-query-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: query-service
diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile
index 0bcf5e9c2d106eab6aa0b475a7ee39abd09d2ada..e0849c308f65985f0200a36e9151fd8735242ee5 100644
--- a/fda-table-service/Dockerfile
+++ b/fda-table-service/Dockerfile
@@ -30,14 +30,15 @@ ENV BROKER_USERNAME=fda
 ENV BROKER_PASSWORD=fda
 ENV SEARCH_ENDPOINT=search-service
 ENV GATEWAY_ENDPOINT=http://gateway-service:9095
+ENV LOG_LEVEL=debug
 
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
-COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
+COPY --from=build ./rest-service/target/rest-service-*.jar ./table-service.jar
 
 EXPOSE 9094
 
-ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./rest.jar"]
+ENTRYPOINT ["java", "-Dlog4j2.formatMsgNoLookups=true", "-jar", "./table-service.jar"]
diff --git a/fda-table-service/rest-service/src/main/resources/application-docker.yml b/fda-table-service/rest-service/src/main/resources/application-docker.yml
index a1431ca2e0b0be0c9ed0ee76f1de419808b25894..b5a642f22e584e17d14f1306ac3940c3a939526e 100644
--- a/fda-table-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-table-service/rest-service/src/main/resources/application-docker.yml
@@ -30,7 +30,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: table-service
diff --git a/fda-table-service/rest-service/src/main/resources/application.yml b/fda-table-service/rest-service/src/main/resources/application.yml
index 1d73957f55da6181002e5c04cfcdd7dc20577fbe..1762a0569020c40d5548703b5f54a08615bbab9d 100644
--- a/fda-table-service/rest-service/src/main/resources/application.yml
+++ b/fda-table-service/rest-service/src/main/resources/application.yml
@@ -30,7 +30,7 @@ logging:
   pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
-    at.tuwien.: trace
+    at.tuwien.: "${LOG_LEVEL}"
     org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver: debug
 eureka:
   instance.hostname: table-service
diff --git a/fda-ui-proxy/.gitignore b/fda-ui-proxy/.gitignore
deleted file mode 100644
index 4d3dae74c833112885155d0915794c3e350b09a5..0000000000000000000000000000000000000000
--- a/fda-ui-proxy/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-default/
diff --git a/fda-ui-proxy/nginx.conf b/fda-ui-proxy/nginx.conf
deleted file mode 100644
index e7cfce7879e682e95f53fb140b030a744440f2d6..0000000000000000000000000000000000000000
--- a/fda-ui-proxy/nginx.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# For more information on configuration, see:
-#   * Official English Documentation: http://nginx.org/en/docs/
-#   * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user nginx;
-worker_processes auto;
-error_log /var/log/nginx/error_log;
-pid /var/run/nginx.pid;
-
-# Load dynamic modules. See /usr/share/nginx/README.dynamic.
-# include /etc/nginx/modules.d/*.conf;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access_log  main;
-
-    sendfile             on;
-    tcp_nopush           on;
-    tcp_nodelay          on;
-    keepalive_timeout    65;
-    types_hash_max_size  2048;
-    client_max_body_size 100G;
-
-    include             /etc/nginx/mime.types;
-    default_type        application/octet-stream;
-
-    # Load modular configuration files from the /etc/nginx/conf.d directory.
-    # See http://nginx.org/en/docs/ngx_core_module.html#include
-    # for more information.
-    include /etc/nginx/conf.d/*.conf;
-
-    server {
-        listen 80 default_server;
-        server_name _;
-        return 301 https://$host$request_uri;
-    }
-
-    server {
-
-        listen 443 ssl;
-        server_name dbrepo.ossdip.at;
-
-        access_log          /var/log/nginx/dbrepo.access.log;
-
-        ssl_certificate     /etc/nginx/fullchain.pem;
-        ssl_certificate_key /etc/nginx/privkey.pem;
-
-        location / {
-            proxy_set_header        Host $host;
-            proxy_set_header        X-Real-IP $remote_addr;
-            proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header        X-Forwarded-Proto $scheme;
-            proxy_pass              http://ui:3000;
-            proxy_read_timeout      90;
-            proxy_redirect          http://ui:3000 https://dbrepo.ossdip.at;
-        }
-
-    }
-
-}