diff --git a/lxc1/p0-infrastructure/mgdb.yml b/lxc1/p0-infrastructure/mgdb.yml
index 23bb04a..ccadc36 100644
--- a/lxc1/p0-infrastructure/mgdb.yml
+++ b/lxc1/p0-infrastructure/mgdb.yml
@@ -1,7 +1,7 @@
 services:
   mariadb:
     image: mariadb:11.4
-    container_name: mariadb-node1
+    container_name: mariadb-node${MGDB_NODE_NUMBER}
     restart: always
     network_mode: host
     environment:
@@ -16,10 +16,10 @@ services:
       #- --wsrep-new-cluster
       - --wsrep-on=ON
       - --wsrep-provider=/usr/lib/galera/libgalera_smm.so
-      - --wsrep-cluster-name=mapletree_cluster
-      - --wsrep-cluster-address=gcomm://172.16.201.208,172.16.201.206
-      - --wsrep-node-address=172.16.201.208
-      - --wsrep-node-name=node1
+      - --wsrep-cluster-name=${CLUSTER_NAME}
+      - --wsrep-cluster-address=gcomm://${CLUSTER_LOCAL_IP},${CLUSTER_REMOTE_IP}
+      - --wsrep-node-address=${CLUSTER_KEEPALIVED_IP}
+      - --wsrep-node-name=node${MGDB_NODE_NUMBER}
       - --binlog-format=row
       - --default-storage-engine=innodb
       - --innodb-autoinc-lock-mode=2
diff --git a/lxc1/p0-infrastructure/minio.yml b/lxc1/p0-infrastructure/minio.yml
index 3347521..bf6cabb 100644
--- a/lxc1/p0-infrastructure/minio.yml
+++ b/lxc1/p0-infrastructure/minio.yml
@@ -1,11 +1,11 @@
 services:
   minio:
     image: quay.io/minio/minio:latest
-    container_name: minio-node1
+    container_name: minio-node${MINIO_NODE_NUMBER}
     network_mode: host
     volumes:
       - /docker/minio/data:/data
     environment:
       - MINIO_ROOT_USER=${MINIO_ADMIN_USER}
       - MINIO_ROOT_PASSWORD=${MINIO_ADMIN_PASS}
-    command: server http://172.16.201.208/data http://172.16.201.206/data --console-address ":9001"
\ No newline at end of file
+    command: server http://${MINIO_LOCAL_KEEPALIVED_IP}/data http://${MINIO_REMOTE_KEEPALIVED_IP}/data --console-address ":9001"
\ No newline at end of file