diff --git a/01 - Wiki/ITSetup/Proxmox Setup.md b/01 - Wiki/ITSetup/Proxmox.md
similarity index 77%
rename from 01 - Wiki/ITSetup/Proxmox Setup.md
rename to 01 - Wiki/ITSetup/Proxmox.md
index 22c1ec6..91b7926 100644
--- a/01 - Wiki/ITSetup/Proxmox Setup.md	
+++ b/01 - Wiki/ITSetup/Proxmox.md	
@@ -1,3 +1,9 @@
+---
+hostname: proxmox.internal
+ipadress: 10.1.2.51
+tags:
+  - Linux
+---
 Docker Containers are Hosted in [[LXC Containers]]
 
 # Custom SMBIOS
@@ -11,7 +17,7 @@ Docker Containers are Hosted in [[LXC Containers]]
 | SKU          | Default string                       |
 | Family       | B550                                 |
 |              |                                      |
-
+# VM
 ```dataview
 
 table guestname, ipadress
@@ -19,3 +25,13 @@ from "01 - Wiki/ITSetup/VM"
 where host = "Proxmox"
 
 ```
+
+
+# Containers
+```dataview
+
+table guestname, ipadress
+from "01 - Wiki/ITSetup/Docker"
+where host = "Proxmox"
+
+```
diff --git a/01 - Wiki/ITSetup/Truennas Setup.md b/01 - Wiki/ITSetup/Truennas Setup.md
index 7297a00..0dc2299 100644
--- a/01 - Wiki/ITSetup/Truennas Setup.md	
+++ b/01 - Wiki/ITSetup/Truennas Setup.md	
@@ -1,8 +1,26 @@
 ---
-tags:
-  - Truenas
-  - Linux
 hostname: truenasscale.internal
 ipadress: 10.1.2.10
+tags:
+  - Linux
+  - Truenas
 ---
-# VM's
\ No newline at end of file
+
+# VM
+```dataview
+
+table guestname, ipadress
+from "01 - Wiki/ITSetup/VM"
+where host = "Truenas"
+
+```
+
+
+# Containers
+```dataview
+
+table guestname, ipadress
+from "01 - Wiki/ITSetup/Docker"
+where host = "Truenas"
+
+```
diff --git a/01 - Wiki/ITSetup/VM/Homeassistant VM.md b/01 - Wiki/ITSetup/VM/Homeassistant VM.md
new file mode 100644
index 0000000..b72ca04
--- /dev/null
+++ b/01 - Wiki/ITSetup/VM/Homeassistant VM.md	
@@ -0,0 +1,12 @@
+---
+host: Truenas
+guestname: Homeassistant
+ipadress: 10.1.2.11
+tags:
+  - Linux
+---
+# Commands before Setup
+
+
+# Custom Commands
+
diff --git a/99 - Meta/01 - Templates/New Host.md b/99 - Meta/01 - Templates/New Host.md
new file mode 100644
index 0000000..ad43f4e
--- /dev/null
+++ b/99 - Meta/01 - Templates/New Host.md	
@@ -0,0 +1,27 @@
+---
+hostname:
+ipadress:
+tags:
+---
+
+
+
+
+# VM
+```dataview
+
+table guestname, ipadress
+from "01 - Wiki/ITSetup/VM"
+where host = ""
+
+```
+
+
+# Containers
+```dataview
+
+table guestname, ipadress
+from "01 - Wiki/ITSetup/Docker"
+where host = ""
+
+```