diff --git a/deploy/crdb.sh b/deploy/crdb.sh
index f27df12fc27ff77b690077cdf2120e4a05556446..ad0bdd30b6d01c8c70ad454220ee7d19f23468b8 100755
--- a/deploy/crdb.sh
+++ b/deploy/crdb.sh
@@ -153,16 +153,8 @@ function crdb_undeploy_single() {
 function crdb_drop_databases_single() {
     echo "Drop TFS databases, if exist"
 
-    if [[ -z "${GITLAB_CI}" ]]; then
-        #kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o yaml
-        CRDB_HOST=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}')
-        CRDB_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
-    else
-        CRDB_HOST="127.0.0.1"
-        CRDB_PORT=${CRDB_EXT_PORT_SQL}
-    fi
-
-    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST}:${CRDB_PORT}/defaultdb?sslmode=require"
+    CRDB_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
+    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@cockroachdb-0:${CRDB_PORT}/defaultdb?sslmode=require"
     echo "CRDB_CLIENT_URL=${CRDB_CLIENT_URL}"
 
     DATABASES=$(
diff --git a/src/device/Dockerfile b/src/device/Dockerfile
index 670b96cb372b749dbaf2b785c93f753185a10c71..d760e0c70d44fb4b53455ae60799e61964f5b23f 100644
--- a/src/device/Dockerfile
+++ b/src/device/Dockerfile
@@ -91,12 +91,13 @@ RUN touch tests/tools/mock_ietf_actn_sdn_ctrl/__init__.py
 COPY src/tests/tools/mock_ietf_actn_sdn_ctrl/. tests/tools/mock_ietf_actn_sdn_ctrl/
 
 # Clone OpenConfig YANG models
-RUN mkdir -p /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public
 RUN mkdir -p /tmp/openconfig
 RUN git clone https://github.com/openconfig/public.git /tmp/openconfig
 WORKDIR /tmp/openconfig
 RUN git fetch
 RUN git checkout v4.4.0
+RUN rm -rf /var/teraflow/device/service/drivers/gnmi_openconfig/git
+RUN mkdir -p /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public
 RUN mv /tmp/openconfig/release /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public
 RUN mv /tmp/openconfig/third_party /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public
 RUN rm -rf /tmp/openconfig
diff --git a/src/webui/service/templates/base.html b/src/webui/service/templates/base.html
index 8bded20ffee4e01f2d234199f80eb1aad297f15c..d2eadf121b4857c035f24746787c05a1c9f070be 100644
--- a/src/webui/service/templates/base.html
+++ b/src/webui/service/templates/base.html
@@ -192,7 +192,7 @@
           <div class="container">
             <div class="row">
               <div class="col-md-12">
-                <p class="text-center" style="color: white;">&copy; 2022-2024 <a href="https://tfs.etsi.org/">ETSI OSG/SDG TeraFlowSDN (TFS)</a></p>
+                <p class="text-center" style="color: white;">&copy; 2022-2024 <a href="https://tfs.etsi.org/">ETSI SDG TeraFlowSDN (TFS)</a></p>
               </div>
             </div>
             <div class="row">
diff --git a/src/webui/service/templates/js/topology.js b/src/webui/service/templates/js/topology.js
index 3e0a766ee6f7bfbcad3a76c64c0f260514b092ef..8a8ba0e40eda2f677b4efee6130ac5dc9cc64206 100644
--- a/src/webui/service/templates/js/topology.js
+++ b/src/webui/service/templates/js/topology.js
@@ -86,21 +86,21 @@ d3.json("{{ url_for('main.topology') }}", function(data) {
             return l.name.toLowerCase().includes('mgmt') ? "5,5" : "0";
         });
 
-     optical_link = svg.append("g").attr("class", "links").style('stroke', '#aaa')
-         .selectAll("line")
-         .data(data.optical_links)
-         .enter()
-         .append("line")
-         .attr("opacity", 1)
-         .attr("stroke", function(l) {
-             return l.name.toLowerCase().includes('mgmt') ? '#AAAAAA' : '#555555';
-         })
-         .attr("stroke-width", function(l) {
-             return l.name.toLowerCase().includes('mgmt') ? 1 : 2;
-         })
-         .attr("stroke-dasharray", function(l) {
-             return l.name.toLowerCase().includes('mgmt') ? "5,5" : "0";
-         });   
+    optical_link = svg.append("g").attr("class", "links")//.style('stroke', '#aaa')
+        .selectAll("line")
+        .data(data.optical_links)
+        .enter()
+        .append("line")
+        .attr("opacity", 1)
+        .attr("stroke", function(l) {
+            return l.name.toLowerCase().includes('mgmt') ? '#AAAAAA' : '#555555';
+        })
+        .attr("stroke-width", function(l) {
+            return l.name.toLowerCase().includes('mgmt') ? 1 : 2;
+        })
+        .attr("stroke-dasharray", function(l) {
+            return l.name.toLowerCase().includes('mgmt') ? "5,5" : "0";
+        });
 
     node = svg.append("g").attr("class", "devices").attr('r', 20).style('fill', '#69b3a2')
         .selectAll("circle")
@@ -130,18 +130,19 @@ d3.json("{{ url_for('main.topology') }}", function(data) {
     simulation.nodes(data.devices);
 
     // add forces, associate each with a name, and set their properties
+    // Experimental : Optical link part 
+    all_links = data.links.concat(data.optical_links)
     simulation
         .force("link", d3.forceLink()
             .id(function(d) {return d.id;})
             .distance(forceProperties.link.distance)
             .iterations(forceProperties.link.iterations)
-            .links(forceProperties.link.enabled ? data.links.length>0? data.links :[]:[]))
-//  ------------------    Experimental : Optical link part 
-        .force("link", d3.forceLink()
-            .id(function(d) {return d.id;})
-            .distance(forceProperties.link.distance)
-            .iterations(forceProperties.link.iterations)
-            .links(forceProperties.link.enabled ?  data.optical_links.length>0?data.optical_links:[]:[])) 
+            .links(
+                forceProperties.link.enabled ? (
+                    (all_links.length > 0) ? all_links : []
+                ) : []
+            )
+        )
 
         .force("charge", d3.forceManyBody()
             .strength(forceProperties.charge.strength * forceProperties.charge.enabled)