diff --git a/01 - ITSetup/Docker/LXC Containers.md b/01 - ITSetup/Docker/LXC Containers.md
index e69de29..d94bde3 100644
--- a/01 - ITSetup/Docker/LXC Containers.md	
+++ b/01 - ITSetup/Docker/LXC Containers.md	
@@ -0,0 +1,7 @@
+---
+host: Proxmox
+tags:
+  - Linux
+---
+
+
diff --git a/01 - ITSetup/Docker/Nextcloud.md b/01 - ITSetup/Docker/Nextcloud.md
index 65e2329..3cc2266 100644
--- a/01 - ITSetup/Docker/Nextcloud.md	
+++ b/01 - ITSetup/Docker/Nextcloud.md	
@@ -1 +1,17 @@
-Host: #Truenas
+---
+host: Truenas
+containername: Nextcloud
+ipadress:
+tags:
+  - Linux
+---
+# Environment Variables
+
+
+# Elevated Rights
+
+
+# Added Folders
+
+
+# Container Networking
diff --git a/01 - ITSetup/VM/Main Linux VM.md b/01 - ITSetup/VM/Main Linux VM.md
new file mode 100644
index 0000000..4bfc676
--- /dev/null
+++ b/01 - ITSetup/VM/Main Linux VM.md	
@@ -0,0 +1,12 @@
+---
+host: Proxmox
+guestname: Linux-Main
+ipadress:
+tags:
+  - Linux
+---
+# Commands before Setup
+
+
+# Custom Commands
+
diff --git a/01 - ITSetup/VM/Main Windows VM.md b/01 - ITSetup/VM/Main Windows VM.md
index 329c487..7d34e63 100644
--- a/01 - ITSetup/VM/Main Windows VM.md	
+++ b/01 - ITSetup/VM/Main Windows VM.md	
@@ -1,5 +1,15 @@
-Host: Proxmox
-Name: Win-10-Main
+---
+host: Proxmox
+guestname: Win-10-Main
+ipadress:
+tags:
+  - Windows
+---
+# Commands before Setup
+
+
+# Custom Commands
+
 Commands before Setup: 
 to-do
 Custom Commands: 
diff --git a/99 - Meta/01 - Templates/New Container.md b/99 - Meta/01 - Templates/New Container.md
new file mode 100644
index 0000000..a94eb66
--- /dev/null
+++ b/99 - Meta/01 - Templates/New Container.md	
@@ -0,0 +1,16 @@
+---
+host:
+containername:
+ipadress:
+tags:
+---
+# Environment Variables
+
+
+# Elevated Rights
+
+
+# Added Folders
+
+
+# Container Networking
diff --git a/99 - Meta/01 - Templates/New VM.md b/99 - Meta/01 - Templates/New VM.md
new file mode 100644
index 0000000..5aa51b2
--- /dev/null
+++ b/99 - Meta/01 - Templates/New VM.md	
@@ -0,0 +1,11 @@
+---
+host:
+guestname:
+ipadress:
+tags:
+---
+# Commands before Setup
+
+
+# Custom Commands
+
diff --git a/99 - Meta/New VM.md b/99 - Meta/New VM.md
deleted file mode 100644
index 0ef9e2f..0000000
--- a/99 - Meta/New VM.md	
+++ /dev/null
@@ -1,4 +0,0 @@
----
-tags:
-host:
----