diff --git a/charts/ska-tango-base/templates/databaseds.yaml b/charts/ska-tango-base/templates/databaseds.yaml
index 95401ac2e3520ca0542abd5dbd4efebbbe26419d..54f6e0b6cb1535c73d72f1bdf5eec25356993167 100644
--- a/charts/ska-tango-base/templates/databaseds.yaml
+++ b/charts/ska-tango-base/templates/databaseds.yaml
@@ -152,7 +152,7 @@ spec:
           - -ORBendPoint
           - giop:tcp::{{ $databaseds_port }}
           - -ORBendPointPublish
-          - giop:tcp:{{ tpl ($databaseds_name | toString) . }}.{{ .Release.Namespace }}.svc.{{ $cluster_domain }}:{{ $databaseds_port }}
+          - giop:tcp:$(TANGO_SERVER_PUBLISH_HOSTNAME):{{ $databaseds_port }}
         env:
           - name: MYSQL_HOST
             value: "{{ template "ska-tango-base.name" . }}-{{ .Values.tangodb.component }}:3306"
diff --git a/images/ska-tango-images-tango-cpp/Dockerfile b/images/ska-tango-images-tango-cpp/Dockerfile
index 0e496e09b1a6f3546c6f0a02b9ee0c36929d16eb..46d793a52b9309c23be0c0d5eda74d0a9c399286 100644
--- a/images/ska-tango-images-tango-cpp/Dockerfile
+++ b/images/ska-tango-images-tango-cpp/Dockerfile
@@ -6,7 +6,6 @@
 ARG CAR_OCI_REGISTRY_HOST
 ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.3.11"
 ARG BASE_IMAGE="ubuntu:22.04"
-ARG TANGO_VERSION="9.4.1"
 FROM $BUILD_IMAGE as buildenv
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -42,7 +41,7 @@ RUN mkdir -p /usr/src/tango
 WORKDIR /usr/src/tango
 
 RUN git clone https://gitlab.com/tango-controls/cppTango.git /usr/src/tango && \
-    cd /usr/src/tango && git checkout $TANGO_VERSION && \
+    cd /usr/src/tango && \
     mkdir build && \
     cmake . -B build \
     -DBUILD_TESTING=OFF \