diff --git a/webservice-balancer/deploy_webservice.py b/webservice-balancer/deploy_webservice.py
index 609704b..e776a80 100755
--- a/webservice-balancer/deploy_webservice.py
+++ b/webservice-balancer/deploy_webservice.py
@@ -171,7 +171,7 @@ if __name__ == "__main__":
 
         servers = [
             create_server(
-                client, server_name + "_" + str(i+1), ssh_key, vnet, location, ci_webservice
+                client, f"{i+1}-{server_name}", ssh_key, vnet, location, ci_webservice
             )
             for i in range(SERVERS_NO)
         ]
@@ -188,7 +188,7 @@ if __name__ == "__main__":
     elif action == "--clean":
         remove_load_balancer(client, load_balancer_name)
         for i in range(SERVERS_NO):
-            remove_server(client, server_name + "_" + str(i+1))
+            remove_server(client, f"{i+1}-{server_name}")
         remove_network(client, net_name)
         remove_key(client, key_name)
         print("\n\n\t\tIt was nice to meet you!")