diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index bd2369c83395030ef1acaa3635b263778d1c90a8..e801c4dc9c7c60d5c95d2a1b9da4bbab9aef390c 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -245,7 +245,7 @@ services:
     init: true
     restart: "no"
     container_name: dbrepo-auth-service-init
-    image: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:${APP_VERSION}
     environment:
       AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
       METADATA_DB: "${METADATA_DB:-dbrepo}"
@@ -270,7 +270,7 @@ services:
     restart: "no"
     container_name: dbrepo-metadata-service
     hostname: metadata-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:${APP_VERSION}
     environment:
       ADMIN_EMAIL: "${ADMIN_EMAIL:-noreply@localhost}"
       ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://analyse-service:8080}"
@@ -334,7 +334,7 @@ services:
     restart: "no"
     container_name: dbrepo-analyse-service
     hostname: analyse-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:${APP_VERSION}
     environment:
       AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
       AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -404,7 +404,7 @@ services:
     restart: "no"
     container_name: dbrepo-search-service
     hostname: search-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/search-service:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/search-service:${APP_VERSION}
     environment:
       AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
       AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -428,7 +428,7 @@ services:
     restart: "no"
     container_name: dbrepo-ui
     hostname: ui
-    image: registry.datalab.tuwien.ac.at/dbrepo/ui:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/ui:${APP_VERSION}
     environment:
       NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
       NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://gateway-service}"
@@ -491,7 +491,7 @@ services:
     restart: "no"
     container_name: dbrepo-identity-service
     hostname: identity-service
-    image: bitnami/openldap:2.6.8-debian-12-r1
+    image: docker.io/bitnami/openldap:${OPENLDAP_VERSION}
     environment:
       LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
       LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
@@ -515,7 +515,7 @@ services:
     init: true
     container_name: dbrepo-search-service-init
     hostname: search-service-init
-    image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:${APP_VERSION}
     environment:
       LOG_LEVEL: ${LOG_LEVEL:-info}
       METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
@@ -538,7 +538,7 @@ services:
     init: true
     container_name: dbrepo-dashboard-service-init
     hostname: search-dashboard-init
-    image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service-init:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service-init:${APP_VERSION}
     environment:
       LOG_LEVEL: ${LOG_LEVEL:-info}
       DASHBOARD_UI_ENDPOINT: "${DASHBOARD_UI_ENDPOINT:-http://dashboard-ui:3000}"
@@ -595,7 +595,7 @@ services:
     init: true
     container_name: dbrepo-storage-service-init
     hostname: storage-service-init
-    image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:${APP_VERSION}
     environment:
       S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin}
       S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -613,7 +613,7 @@ services:
     restart: "no"
     container_name: dbrepo-data-service
     hostname: data-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/data-service:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/data-service:${APP_VERSION}
     environment:
       AUTH_SERVICE_CLIENT: "${AUTH_SERVICE_CLIENT:-dbrepo-client}"
       AUTH_SERVICE_CLIENT_SECRET: "${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}"
@@ -676,7 +676,7 @@ services:
       DASHBOARD_DB_USERNAME: "${DASHBOARD_DB_USERNAME:-grafana}"
       DASHBOARD_DB_PASSWORD: "${DASHBOARD_DB_PASSWORD:-dbrepo}"
       GF_SERVER_ROOT_URL: http://dashboard-ui:3000/dashboard/
-      GF_INSTALL_PLUGINS: "yesoreyeram-infinity-datasource"
+      GF_INSTALL_PLUGINS: "yesoreyeram-infinity-datasource,grafana-opensearch-datasource"
       GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: "true"
       LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
       LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
@@ -695,7 +695,7 @@ services:
     restart: "no"
     container_name: dbrepo-dashboard-service
     hostname: dashboard-service
-    image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:${DBREPO_VERSION}
+    image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:${APP_VERSION}
     ports:
       - "4070:8080"
     environment:
diff --git a/.env b/.env
index 11a6a010490580b666607d347295921345ee056c..7c9b6e1b99cba36d3523561ec5c9fe567935d80c 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
+APP_VERSION=1.8
 MARIADB_VERSION=11.3.2
 POSTGRES_VERSION=17.0.0
 KEYCLOAK_VERSION=26.2.2
@@ -7,4 +8,4 @@ NGINX_VERSION=1.27.3-alpine3.20-slim
 OPENLDAP_VERSION=2.6.8
 SEAWEEDFS_VERSION=3.71.0
 PROMETHEUS_VERSION=2.54.1
-MYSQLD_EXPORTER_VERSION=0.15.1
\ No newline at end of file
+MYSQLD_EXPORTER_VERSION=0.15.1
diff --git a/dbrepo-ui-new/requirements.txt b/dbrepo-ui-new/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..607fa97eb38239c11fda50d1f7c58625e98635e7
--- /dev/null
+++ b/dbrepo-ui-new/requirements.txt
@@ -0,0 +1,37 @@
+aiohappyeyeballs==2.4.4
+aiohttp==3.11.11
+aiosignal==1.3.2
+annotated-types==0.7.0
+attrs==24.3.0
+blinker==1.8.2
+certifi==2024.12.14
+charset-normalizer==3.4.1
+click==8.1.7
+colorama==0.4.6
+dbrepo==1.6.0
+Flask==3.0.3
+frozenlist==1.5.0
+idna==3.10
+itsdangerous==2.2.0
+Jinja2==3.1.4
+MarkupSafe==2.1.5
+multidict==6.1.0
+numpy==2.2.1
+pandas==2.2.3
+pika==1.3.2
+propcache==0.2.1
+pydantic==2.10.5
+pydantic_core==2.27.2
+python-dateutil==2.9.0.post0
+python-dotenv==1.0.1
+pytz==2024.2
+requests==2.32.3
+six==1.17.0
+tinydb==4.8.2
+tuspy==1.1.0
+typing_extensions==4.12.2
+tzdata==2024.2
+urllib3==2.3.0
+watchdog==5.0.2
+Werkzeug==3.0.4
+yarl==1.18.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 0ab60713087c390cbff2ce697fac677723ece0f7..5f7f2cf605ea9d27ae0af32845ed42805d3bdc5d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -518,7 +518,7 @@ services:
     restart: "no"
     container_name: dbrepo-identity-service
     hostname: identity-service
-    image: bitnami/openldap:${OPENLDAP_VERSION}
+    image: docker.io/bitnami/openldap:${OPENLDAP_VERSION}
     ports:
       - '1389:1389'
       - '1636:1636'