diff --git a/opencontrail/control.sls b/opencontrail/control.sls
index 988eb0c..3727517 100644
--- a/opencontrail/control.sls
+++ b/opencontrail/control.sls
@@ -64,6 +64,13 @@
   - source: salt://opencontrail/files/{{ control.version }}/control/contrail-rndc.conf
   - makedirs: True
 
+{%- if control.version >= 4.0 %}
+/etc/contrail/contrail-issu.conf:
+  file.managed:
+  - source: salt://opencontrail/files/{{ control.version }}/contrail-issu.conf
+  - template: jinja
+{%- endif %}
+
 {%- if control.version == 3.0 and control.get('dns', {}).get('forwarders', False) %}
 contrail_control_resolv:
   file.managed:
diff --git a/opencontrail/files/4.0/config.global.js b/opencontrail/files/4.0/config.global.js
index dcbd92f..c5ceb47 100644
--- a/opencontrail/files/4.0/config.global.js
+++ b/opencontrail/files/4.0/config.global.js
@@ -281,10 +281,10 @@
 config.insecure_access = false;
 
 // HTTP port for NodeJS Server.
-config.http_port = '8080';
+config.http_port = '{{ web.get("http",{}).get("port","8080") }}';
 
 // HTTPS port for NodeJS Server.
-config.https_port = '8143';
+config.https_port = '{{ web.get("https",{}).get("port","8080") }}';
 
 // Activate/Deactivate Login.
 config.require_auth = false;
diff --git a/opencontrail/files/4.0/contrail-issu.conf b/opencontrail/files/4.0/contrail-issu.conf
index e69de29..abf9fd7 100644
--- a/opencontrail/files/4.0/contrail-issu.conf
+++ b/opencontrail/files/4.0/contrail-issu.conf
@@ -0,0 +1 @@
+[DEFAULTS]
\ No newline at end of file
diff --git a/opencontrail/files/4.0/doctrail b/opencontrail/files/4.0/doctrail
index e40f76c..eaba912 100644
--- a/opencontrail/files/4.0/doctrail
+++ b/opencontrail/files/4.0/doctrail
@@ -27,11 +27,20 @@
   if [ "$CORRECT" -gt 0 ] && [ "$1" != "all" ]; then
     if [ "$2" == "console" ]; then
       echo "Starting console:"
-      NODE=$(docker ps | grep _$1_ | awk '{print $1}')
-      docker exec -it $NODE bash
+      NODE=$(docker ps | grep "opencontrail.$1[-_]" | awk '{print $1}')
+      if [[ $NODE =~ ^[0-9a-fA-F]+$ ]]; then
+        docker exec -it $NODE bash
+      else
+        echo "Unknow container name, please use -h paramater for help."
+      fi
     else
-      NODE=$(docker ps | grep _$1_ | awk '{print $1}')
-      docker exec $NODE ${@:2}
+      NODE=$(docker ps | grep "opencontrail.$1[-_]" | awk '{print $1}')
+      if [[ $NODE =~ ^[0-9a-fA-F]+$ ]]; then
+        docker exec $NODE ${@:2}
+      else
+        echo "Unknow container name, please use -h paramater for help."
+      fi
+
     fi
   else
     echo "Unknow target, use -h or --help paramater for help"