diff --git a/bundles/steam/items.py b/bundles/steam/items.py
index 720bdf3..12d5e1f 100644
--- a/bundles/steam/items.py
+++ b/bundles/steam/items.py
@@ -1,12 +1,18 @@
 users = {
     'steam': {
-        'home': '/opt/steam',
+        'home': '/opt/steam/steam',
     },
 }
 
 directories = {
     '/opt/steam': {
         'owner': 'steam',
+        'needs': [
+            'zfs_dataset:tank/steam',
+        ],
+    },
+    '/opt/steam/steam': {
+        'owner': 'steam',
     },
     '/opt/steam/.steam': {
         'owner': 'steam',
@@ -14,12 +20,12 @@ directories = {
 }
 
 files = {
-    '/opt/steam/steamcmd_linux.tar.gz': {
+    '/opt/steam/steam/steamcmd_linux.tar.gz': {
         'content_type': 'download',
         'source': 'https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz',
         'owner': 'steam',
     },
-    '/opt/steam-workshop-downloader': {
+    '/opt/steam/workshop-downloader': {
         'content_type': 'download',
         'source': 'https://github.com/SegoCode/swd/releases/download/1.1/swd-linux-amd64',
         'owner': 'steam',
@@ -27,32 +33,26 @@ files = {
     },
 }
 
-symlinks = {
-    # /opt/steam/.steam/sdk32/steamclient.so: cannot open shared object file: No such file or directory
-    '/opt/steam/.steam/sdk32': {
-        'target': '/opt/steam/linux32',
-    }
-}
+# symlinks = {
+#     # /opt/steam/.steam/sdk32/steamclient.so: cannot open shared object file: No such file or directory
+#     '/opt/steam/.steam/sdk32': {
+#         'target': '/opt/steam/linux32',
+#     }
+# }
 
 actions = {
     'extract_steamcmd': {
-        'command': 'tar xfvz /opt/steam/steamcmd_linux.tar.gz --directory /opt/steam',
-        'unless': 'test -f /opt/steam/steamcmd.sh',
+        'command': """su - steam -c 'tar xfvz /opt/steam/steam/steamcmd_linux.tar.gz --directory /opt/steam/steam'""",
+        'unless': 'test -f /opt/steam/steam/steamcmd.sh',
         'needs': [
-            'file:/opt/steam/steamcmd_linux.tar.gz',
-        ],
-    },
-    'chown_steamcmd': {
-        'command': 'chown -R steam /opt/steam',
-        'triggered': True,
-        'triggered_by': [
-            'action:extract_steamcmd',
+            'file:/opt/steam/steam/steamcmd_linux.tar.gz',
         ],
     },
 }
 
 svc_systemd['steam-update'] = {
     'running': False,
+    'enabled': False,
     'needs': {
         'file:/usr/local/lib/systemd/system/steam-update.service',
     }
diff --git a/bundles/steam/metadata.py b/bundles/steam/metadata.py
index a76b710..def65d1 100644
--- a/bundles/steam/metadata.py
+++ b/bundles/steam/metadata.py
@@ -6,19 +6,24 @@ defaults = {
         },
     },
     'steam': {
-        'games': {},
-    }
+        'games': {
+            'left4dead2': 222860,
+        },
+    },
+    'zfs': {
+        'datasets': {
+            'tank/steam': {
+                'mountpoint': '/opt/steam',
+                'backup': False,
+            },
+        },
+    },
 }
 
 @metadata_reactor.provides(
     'systemd/units',
 )
 def initial_unit(metadata):
-    install_games = ' '.join(
-        f'+force_install_dir /opt/{name} +app_update {id}'
-            for name, id in metadata.get('steam/games').items()
-    )
-    
     return {
         'systemd': {
             'units': {
@@ -32,7 +37,10 @@ def initial_unit(metadata):
                         'User': 'steam',
                         'Group': 'steam',
                         'WorkingDirectory': '/opt/steam',
-                        'ExecStart': f'/opt/steam/steamcmd.sh +login anonymous {install_games} validate +quit',
+                        'ExecStart': {
+                            f'/opt/steam/steam/steamcmd.sh +force_install_dir /opt/steam/{name} +login anonymous +app_update {id} validate +quit'
+                                for name, id in metadata.get('steam/games').items()
+                        }
                     },
                     'Install': {
                         'WantedBy': {'multi-user.target'},
diff --git a/nodes/netcup.mails.py b/nodes/netcup.mails.py
index 44bcc09..4e75990 100644
--- a/nodes/netcup.mails.py
+++ b/nodes/netcup.mails.py
@@ -16,6 +16,7 @@
         'zfs',
         'lonercrew',
         'build-ci',
+        'steam',
     ],
     'metadata': {
         'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',