diff --git a/.env.sample b/.env.sample
index 202af3f284a4c77c298d7a5d94471392aff2c80b..cfb9d904cca5c52c24dc67ee7cfe81e57be636bc 100644
--- a/.env.sample
+++ b/.env.sample
@@ -35,4 +35,4 @@ POSTGRES_PASSWORD=CHANGE_ME
 SP_HOST=polaris.ruhr-uni-bochum.de
 ANONYMIZATION_HASH_PREFIX=anon
 ANONYMIZATION_DEFAULT_MINIMUM_COUNT=10
-
+POLARIS_VERSION=v1.0.1-rc10
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 12515d3f56850c3f5b7bac3d92c5d2c163fe75f9..0c84f37e05a56d4538fedaf4195113b3f4bed876 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,6 @@
 services:
- # MONGO DB
+  
+  # MONOG as LRS
   mongodb_container:
     image: mongo:6
     restart: always
@@ -9,7 +10,7 @@ services:
     ports:
       - 27017:27017
     volumes:
-      - ./mongodb_data:/data/db
+      - mongodb_data:/data/db
 
   # RIGHTS ENGINE
   database:
@@ -19,7 +20,13 @@ services:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
       MYSQL_DATABASE: polaris
     volumes:
-      - ./db:/var/lib/mysql
+      - mariadb_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 15s
 
   redis_db:
     image: redis:7-alpine
@@ -27,16 +34,19 @@ services:
     command: redis-server --requirepass ${REDIS_PASSWORD}
 
   rights-engine:
-    image: registry.git.rwth-aachen.de/polaris/entwicklung/rights-engine/rights-engine:latest
+    image: registry.git.rwth-aachen.de/polaris/entwicklung/rights-engine/rights-engine:${POLARIS_VERSION}
     restart: always
     ports:
       - 8004:80
     environment:
       - CELERY_BROKER_URL=redis://:${REDIS_PASSWORD}@redis_db:6379
     depends_on:
-      - database
-      - redis_db
-      - mongodb_container
+      database: 
+          condition: service_healthy
+      redis_db:
+          condition: service_started
+      mongodb_container:
+          condition: service_started
     volumes:
       - ".env:/usr/src/app/backend/.env"
       - "./id_rsa.pub:/usr/src/app/backend/id_rsa.pub"
@@ -44,7 +54,7 @@ services:
       - "./data_disclosure_zips/:/usr/src/app/backend/data_disclosure_zips"
 
   beat:
-    image: registry.git.rwth-aachen.de/polaris/entwicklung/rights-engine/rights-engine:latest
+    image: registry.git.rwth-aachen.de/polaris/entwicklung/rights-engine/rights-engine:${POLARIS_VERSION}
     restart: always
     entrypoint: celery
     command: -A backend beat -l info
@@ -60,7 +70,7 @@ services:
       - "./id_rsa:/usr/src/app/backend/id_rsa"
 
   worker:
-    image: registry.git.rwth-aachen.de/polaris/entwicklung/rights-engine/rights-engine:latest
+    image: registry.git.rwth-aachen.de/polaris/entwicklung/rights-engine/rights-engine:${POLARIS_VERSION}
     restart: always
     entrypoint: celery
     command: -A backend worker --loglevel=debug
@@ -86,7 +96,7 @@ services:
        - POSTGRES_USER=${POSTGRES_USER}
        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
      volumes:
-       - ./database_analytics/production:/var/lib/postgresql/data
+       - database_analytics:/var/lib/postgresql/data
 
   redis_db_anayltics:
     image: redis:7-alpine
@@ -141,3 +151,8 @@ services:
     restart: always
     ports:
       - 8005:80
+
+volumes:
+ mongodb_data:
+ mariadb_data:
+ database_analytics:
\ No newline at end of file