diff --git a/src/agent/docker-rest-agent/server.py b/src/agent/docker-rest-agent/server.py
index 9080e193..0cc9c4fa 100644
--- a/src/agent/docker-rest-agent/server.py
+++ b/src/agent/docker-rest-agent/server.py
@@ -23,12 +23,12 @@ def get_network():
     containers = {}
     for container in container_list:
         containers[container.id]={
-        "id":container.id,
-        "short_id":container.short_id,
-        "name":container.name,
-        "status":container.status,
-        "image":str(container.image),
-        "attrs":container.attrs
+            "id":container.id,
+            "short_id":container.short_id,
+            "name":container.name,
+            "status":container.status,
+            "image":str(container.image),
+            "attrs":container.attrs
         }
     res = {'code':PASS_CODE, 'data':containers, 'msg':''}
     return jsonify({'res':res})
@@ -37,11 +37,11 @@ def get_network():
 def create_node():
     node_name = request.form.get('name')
     env = {
-    'HLF_NODE_MSP': request.form.get('msp'),
-    'HLF_NODE_TLS':request.form.get('tls'),
-    'HLF_NODE_PEER_CONFIG':request.form.get('peer_config_file'),
-    'HLF_NODE_ORDERER_CONFIG':request.form.get('orderer_config_file'),
-    'platform': 'linux/amd64',
+        'HLF_NODE_MSP': request.form.get('msp'),
+        'HLF_NODE_TLS':request.form.get('tls'),
+        'HLF_NODE_PEER_CONFIG':request.form.get('peer_config_file'),
+        'HLF_NODE_ORDERER_CONFIG':request.form.get('orderer_config_file'),
+        'platform': 'linux/amd64',
     }
     port_map = ast.literal_eval(request.form.get("port_map"))
     volumes = [        
@@ -113,7 +113,7 @@ def create_node():
             volumes=volumes,
             environment=env,
             ports=port_map
-            )
+        )
     except:
         res['code'] = FAIL_CODE
         res['data'] = sys.exc_info()[0]
diff --git a/src/api-engine/api/lib/agent/docker/handler.py b/src/api-engine/api/lib/agent/docker/handler.py
index 7edde424..5a6085b3 100644
--- a/src/api-engine/api/lib/agent/docker/handler.py
+++ b/src/api-engine/api/lib/agent/docker/handler.py
@@ -40,7 +40,7 @@ def create(self, info):
                 'tls': info.get("tls")[2:-1],
                 'peer_config_file': info.get("config_file")[2:-1],
                 'orderer_config_file': info.get("config_file")[2:-1],
-                'img': 'hyperledger/fabric:2.5.10',
+                'img': 'hyperledger/fabric-peer:2.5.10' if info.get("type") == "peer" else 'hyperledger/fabric-orderer:2.5.10',
                 'cmd': 'bash /tmp/init.sh "peer node start"' if info.get("type") == "peer" else 'bash /tmp/init.sh "orderer"',
                 'name': info.get("name"),
                 'type': info.get("type"),