diff --git a/bkk07 b/bkk07
index bfb6f97..1e7541f 100644
--- a/bkk07
+++ b/bkk07
@@ -11,6 +11,7 @@ routers
 polkadot
 hydration
 cumulus
+penumbra
 misc-container
 
 [prometheus]
@@ -41,6 +42,9 @@ bkk50
 [hydration]
 hdx27
 
+[penumbra]
+penumbra02
+
 [polkadot]
 rpc-polkadot-02
 rpc-kusama-02
diff --git a/host_vars/penumbra02.yaml b/host_vars/penumbra02.yaml
new file mode 100644
index 0000000..aeebce4
--- /dev/null
+++ b/host_vars/penumbra02.yaml
@@ -0,0 +1,19 @@
+---
+ansible_host: "160.22.181.181"
+container_ip: "192.168.177.82"
+ansible_port: 2482
+host_name: "penumbra02.ct.rotko.net"
+host_timezone: "Asia/Bangkok"
+netif: '{"net0":"name=eth0,gw={{ default_nat_network_forward_cidr.split("/")[0] }},ip={{ default_host_ip }}/8,bridge={{ default_nat_device }}"}'
+role: "penumbra"
+pinned_service: True
+
+default_network: "penumbra"
+default_node_type: "validator"
+default_p2p_port: 33691
+default_p2p_port_ws: 34691
+default_p2p_port_wss: 35691
+default_rpc_port: 9691
+default_secure_rpc_port: 42691
+default_prom_port: 7691
+zabbix_ext_port: 10691
diff --git a/roles/setup_install_penumbra/templates/cometbft.service.j2 b/roles/setup_install_penumbra/templates/cometbft.service.j2
index 2683465..fe7adfe 100644
--- a/roles/setup_install_penumbra/templates/cometbft.service.j2
+++ b/roles/setup_install_penumbra/templates/cometbft.service.j2
@@ -1,5 +1,5 @@
 [Unit]
-Description=CometBFT for Penumbra
+Description={{ host_name.split('.')[0] }} - cometbft service
 
 [Service]
 ExecStart={{ default_home_path }}/cometbft start --home {{ default_database_path }}/node0/cometbft
diff --git a/roles/setup_install_penumbra/templates/pd.service.j2 b/roles/setup_install_penumbra/templates/validator.service.j2
similarity index 92%
rename from roles/setup_install_penumbra/templates/pd.service.j2
rename to roles/setup_install_penumbra/templates/validator.service.j2
index f36772b..9db019f 100644
--- a/roles/setup_install_penumbra/templates/pd.service.j2
+++ b/roles/setup_install_penumbra/templates/validator.service.j2
@@ -1,5 +1,5 @@
 [Unit]
-Description=Penumbra Node
+Description={{ host_name.split('.')[0] }} validator - Penumbra service
 Wants=cometbft.service
 
 [Service]