diff --git a/install/beckn-onix.sh b/install/beckn-onix.sh
index afdfd84..2611e77 100755
--- a/install/beckn-onix.sh
+++ b/install/beckn-onix.sh
@@ -12,7 +12,7 @@ install_package(){
 start_container(){
     #ignore orphaned containers warning
     export COMPOSE_IGNORE_ORPHANS=1
-    docker-compose -f docker-compose-v2.yml up -d $1
+    docker-compose -f $1 up -d $2
 }
 
 update_registry_details() {
@@ -50,7 +50,10 @@ update_registry_details() {
     docker volume create registry_data_volume
     docker run --rm -v $SCRIPT_DIR/../registry_data/config:/source -v registry_data_volume:/target busybox cp /source/{envvars,logger.properties,swf.properties} /target/
     docker volume create registry_database_volume
-    docker run --rm -v $SCRIPT_DIR/../registry_data/database:/source -v registry_database_volume:/target busybox cp /source/db.txt /target/db.txt
+    if [ -e $SCRIPT_DIR/../registry_data/database/db.txt ]
+    then
+        docker run --rm -v $SCRIPT_DIR/../registry_data/database:/source -v registry_database_volume:/target busybox cp /source/db.txt /target/db.txt
+    fi    
     docker rmi busybox
 }
 # Function to start the MongoDB, Redis, and RabbitMQ Services
@@ -77,7 +80,7 @@ install_gateway() {
         bash scripts/update_gateway_details.sh registry 
     fi
     echo "${GREEN}................Installing Gateway service................${NC}"
-    start_container gateway
+    start_container "docker-compose-gateway.yml" gateway
     echo "Registering Gateway in the registry"
 
     sleep 10
@@ -99,7 +102,7 @@ install_registry(){
     fi
 
     echo "${GREEN}................Installing Registry service................${NC}"
-    start_container registry
+    start_container "docker-compose-registry.yml" registry
     sleep 10
     echo "Registry installation successful"
 }
@@ -117,8 +120,8 @@ install_bap_protocol_server(){
         bash scripts/update_bap_config.sh
     fi
     sleep 10
-    start_container "bap-client"
-    start_container "bap-network"
+    start_container "docker-compose-bap.yml" "bap-client"
+    start_container "docker-compose-bap.yml" "bap-network"
     sleep 10
     echo "Protocol server BAP installation successful"
 }
@@ -141,8 +144,8 @@ install_bpp_protocol_server(){
     fi
 
     sleep 10
-    start_container "bpp-client"
-    start_container "bpp-network"
+    start_container "docker-compose-bpp.yml" "bpp-client"
+    start_container "docker-compose-bpp.yml" "bpp-network"
     sleep 10
     echo "Protocol server BPP installation successful"
 }
diff --git a/install/docker-compose-bap.yml b/install/docker-compose-bap.yml
new file mode 100644
index 0000000..6aced59
--- /dev/null
+++ b/install/docker-compose-bap.yml
@@ -0,0 +1,27 @@
+version: "3"
+
+services:
+  bap-client:
+    image: fidedocker/protocol-server
+    container_name: bap-client
+    networks:
+      - beckn_network
+    ports:
+      - 5001:5001
+    restart: unless-stopped
+    volumes:
+      - ./protocol-server-data/bap-client.yml:/usr/src/app/config/default.yml
+
+  bap-network:
+    image: fidedocker/protocol-server
+    container_name: bap-network
+    networks:
+      - beckn_network
+    ports:
+      - 5002:5002
+    restart: unless-stopped
+    volumes:
+      - ./protocol-server-data/bap-network.yml:/usr/src/app/config/default.yml
+networks:
+  beckn_network:
+    driver: bridge
diff --git a/install/docker-compose-bpp.yml b/install/docker-compose-bpp.yml
new file mode 100644
index 0000000..5e50b81
--- /dev/null
+++ b/install/docker-compose-bpp.yml
@@ -0,0 +1,28 @@
+version: "3"
+
+services:
+  bpp-client:
+    image: fidedocker/protocol-server
+    container_name: bpp-client
+    networks:
+      - beckn_network
+    ports:
+      - 6001:6001
+    restart: unless-stopped
+    volumes:
+      - ./protocol-server-data/bpp-client.yml:/usr/src/app/config/default.yml
+
+  bpp-network:
+    image: fidedocker/protocol-server
+    container_name: bpp-network
+    networks:
+      - beckn_network
+    ports:
+      - 6002:6002
+    restart: unless-stopped
+    volumes:
+      - ./protocol-server-data/bpp-network.yml:/usr/src/app/config/default.yml
+
+networks:
+  beckn_network:
+    driver: bridge
diff --git a/install/docker-compose-gateway.yml b/install/docker-compose-gateway.yml
new file mode 100644
index 0000000..67113c5
--- /dev/null
+++ b/install/docker-compose-gateway.yml
@@ -0,0 +1,27 @@
+version: "3"
+
+services:
+  gateway:
+    image: fidedocker/gateway
+    container_name: gateway
+    networks:
+      - beckn_network
+    ports:
+      - 4000:4000
+      - 4030:4030
+    restart: unless-stopped
+    volumes:
+      - gateway_data_volume:/gateway/overrideProperties/config
+      - gateway_database_volume:/gateway/database
+
+networks:
+  beckn_network:
+    driver: bridge
+
+volumes:
+  gateway_data_volume:
+    name: gateway_data_volume
+    external: true
+  gateway_database_volume:
+    name: gateway_database_volume
+    external: true
diff --git a/install/docker-compose-registry.yml b/install/docker-compose-registry.yml
new file mode 100644
index 0000000..dad20af
--- /dev/null
+++ b/install/docker-compose-registry.yml
@@ -0,0 +1,27 @@
+version: "3"
+
+services:
+  registry:
+    image: fidedocker/registry
+    container_name: registry
+    networks:
+      - beckn_network
+    ports:
+      - 3000:3000
+      - 3030:3030
+    restart: unless-stopped
+    volumes:
+      - registry_data_volume:/registry/overrideProperties/config
+      - registry_database_volume:/registry/database
+
+networks:
+  beckn_network:
+    driver: bridge
+
+volumes:
+  registry_data_volume:
+    name: registry_data_volume
+    external: true
+  registry_database_volume:
+    name: registry_database_volume
+    external: true
diff --git a/install/scripts/update_gateway_details.sh b/install/scripts/update_gateway_details.sh
index 9cdd8c3..c26b472 100755
--- a/install/scripts/update_gateway_details.sh
+++ b/install/scripts/update_gateway_details.sh
@@ -53,7 +53,7 @@ update_gateway_config() {
         docker volume create gateway_data_volume
         docker volume create gateway_database_volume
         docker run --rm -v $SCRIPT_DIR/../gateway_data/config:/source -v gateway_data_volume:/target busybox cp /source/{envvars,logger.properties,swf.properties} /target/
-        docker run --rm -v $SCRIPT_DIR/../registry_data/database:/source -v gateway_database_volume:/target busybox cp /source/db.txt /target/db.txt
+        docker run --rm -v $SCRIPT_DIR/../gateway_data/database:/source -v gateway_database_volume:/target busybox cp /source/db.txt /target/db.txt
         update_network_json
 
 }