diff --git a/Dockers/remote-node-container/entrypoint.sh b/Dockers/remote-node-container/entrypoint.sh
index b0f29fc..2f0347a 100644
--- a/Dockers/remote-node-container/entrypoint.sh
+++ b/Dockers/remote-node-container/entrypoint.sh
@@ -132,20 +132,20 @@ if [ -n "$TELEPORT_VERSION" ] && [ -n "$TELEPORT_URL" ] && [ -n "$TELEPORT_TOKEN
     if [ ! -f /etc/teleport.yaml ]; then
         teleport configure --roles=node --token="$TELEPORT_TOKEN" --proxy="$TELEPORT_URL" --no-acme -o file
         echo "Created teleport configuration file"
-
-        # Get the hostname of the machine
-        HOSTNAME=$(hostname)
-
-        # Update nodename in teleport config
-        sed -i "s/^  nodename:.*/  nodename: $HOSTNAME/" /etc/teleport.yaml
-
-        add_teleport_labels
     else
         echo "Teleport configuration file already exists, skipping configuration creation"
     fi
 
+    # Get the hostname of the machine
+    HOSTNAME=$(hostname)
+
+    # Update nodename in teleport config
+    sed -i "s/^  nodename:.*/  nodename: $HOSTNAME/" /etc/teleport.yaml
+    add_teleport_labels
+
     # Start Teleport in the background
     echo "Starting Teleport service..."
+    cat /etc/teleport.yaml
     nohup teleport start &
 else
     echo "Skipping Teleport setup - credentials not provided"