diff --git a/.env b/.env
index 298128cc..417e860f 100755
--- a/.env
+++ b/.env
@@ -97,14 +97,15 @@ SHUFFLE_MAX_EXECUTION_DEPTH=
 DATASTORE_EMULATOR_HOST=shuffle-database:8000
 #SHUFFLE_OPENSEARCH_URL=http://shuffle-opensearch:9200
 SHUFFLE_OPENSEARCH_URL=https://shuffle-opensearch:9200
-SHUFFLE_OPENSEARCH_USERNAME="admin"
-SHUFFLE_OPENSEARCH_PASSWORD="StrongShufflePassword321!"
 SHUFFLE_OPENSEARCH_CERTIFICATE_FILE=
 SHUFFLE_OPENSEARCH_APIKEY=
 SHUFFLE_OPENSEARCH_CLOUDID=
 SHUFFLE_OPENSEARCH_PROXY=
 SHUFFLE_OPENSEARCH_INDEX_PREFIX=
 SHUFFLE_OPENSEARCH_SKIPSSL_VERIFY=true
+SHUFFLE_OPENSEARCH_USERNAME="admin"
+SHUFFLE_OPENSEARCH_PASSWORD="StrongShufflePassword321!" # In use for the first time setup of OpenSearch + backend of Shuffle
+OPENSEARCH_INITIAL_ADMIN_PASSWORD="StrongShufflePassword321!" # In use for the first time setup of OpenSearch
 
 #Tenzir related 
 SHUFFLE_TENZIR_URL=
diff --git a/docker-compose.yml b/docker-compose.yml
index 2f096df2..fcc7c0cb 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   frontend:
-    image: ghcr.io/shuffle/shuffle-frontend:latest
+    image: ghcr.io/shuffle/shuffle-frontend:nightly
     container_name: shuffle-frontend
     hostname: shuffle-frontend
     ports:
@@ -15,7 +15,7 @@ services:
     depends_on:
       - backend
   backend:
-    image: ghcr.io/shuffle/shuffle-backend:latest
+    image: ghcr.io/shuffle/shuffle-backend:nightly
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
     # Here for debugging:
@@ -34,7 +34,7 @@ services:
       - SHUFFLE_FILE_LOCATION=/shuffle-files
     restart: unless-stopped
   orborus:
-    image: ghcr.io/shuffle/shuffle-orborus:latest
+    image: ghcr.io/shuffle/shuffle-orborus:nightly
     container_name: shuffle-orborus
     hostname: shuffle-orborus
     networks:
@@ -48,9 +48,6 @@ services:
       - ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
       - BASE_URL=http://${OUTER_HOSTNAME}:5001
       - DOCKER_API_VERSION=1.40
-      - SHUFFLE_BASE_IMAGE_NAME=${SHUFFLE_BASE_IMAGE_NAME}
-      - SHUFFLE_BASE_IMAGE_REGISTRY=${SHUFFLE_BASE_IMAGE_REGISTRY}
-      - SHUFFLE_BASE_IMAGE_TAG_SUFFIX=${SHUFFLE_BASE_IMAGE_TAG_SUFFIX}
       - HTTP_PROXY=${HTTP_PROXY}
       - HTTPS_PROXY=${HTTPS_PROXY}
       - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
@@ -74,7 +71,6 @@ services:
       - node.name=shuffle-opensearch
       - node.store.allow_mmap=false
       - discovery.seed_hosts=shuffle-opensearch
-      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=${SHUFFLE_OPENSEARCH_PASSWORD}
     ulimits:
       memlock:
         soft: -1
@@ -83,7 +79,7 @@ services:
         soft: 65536 
         hard: 65536
     volumes:
-      - ${DB_LOCATION}:/usr/share/opensearch/data:z
+      - shuffle-database:/usr/share/opensearch/data:z
     ports:
       - 9200:9200
     networks:
@@ -129,13 +125,18 @@ services:
   #  networks:
   #    - shuffle
   #
+
+volumes:
+  shuffle-database:
+    driver: local
+    driver_opts:
+      type: none
+      device: ${DB_LOCATION}
+      o: bind
+
 networks:
   shuffle:
     driver: bridge
-
-    # uncomment to set MTU for swarm mode.
-    # MTU should be whatever is your host's preferred MTU is.
-    # Refer to this doc to figure out what your host's MTU is:
-    # https://shuffler.io/docs/troubleshooting#TLS_timeout_error/Timeout_Errors/EOF_Errors 
     # driver_opts:
     #   com.docker.network.driver.mtu: 1460
+    # uncomment to set MTU for swarm mode. MTU should be whatever is your host's preferred MTU is: https://shuffler.io/docs/troubleshooting#TLS_timeout_error/Timeout_Errors/EOF_Errors