diff --git a/bundles/build-server/items.py b/bundles/build-server/items.py
index d09d7bd..088f14c 100644
--- a/bundles/build-server/items.py
+++ b/bundles/build-server/items.py
@@ -12,6 +12,12 @@ files = {
         'owner': 'build-server',
         'content': json.dumps(node.metadata.get('build-server'), indent=4, cls=MetadataJSONEncoder)
     },
+    '/opt/build-server/build-server-crystal': {
+        'content_type': 'download',
+        'source': 'https://dl.sublimity.de/build-server-crystal/build-server-crystal-amd64-latest',
+        'owner': 'build-server',
+        'mode': '500',
+    },
     '/opt/build-server/strategies/crystal': {
         'content_type': 'mako',
         'owner': 'build-server',
@@ -22,3 +28,11 @@ files = {
         },
     },
 }
+
+svc_systemd = {
+    'build-server': {
+        'needs': {
+            'file:/etc/systemd/system/build-server.service',
+        },
+    },
+}
diff --git a/bundles/build-server/metadata.py b/bundles/build-server/metadata.py
index f742198..a883f5f 100644
--- a/bundles/build-server/metadata.py
+++ b/bundles/build-server/metadata.py
@@ -1,17 +1,24 @@
 from ipaddress import ip_interface
 
 defaults = {
-    'flask': {
-        'build-server' : {
-            'git_url': "https://git.sublimity.de/cronekorkn/build-server.git",
-            'port': 4000,
-            'app_module': 'build_server',
-            'user': 'build-server',
-            'group': 'build-server',
-            'timeout': 900,
-            'env': {
-                'CONFIG': '/etc/build-server.json',
-                'STRATEGIES_DIR': '/opt/build-server/strategies',
+    'systemd': {
+        'units': {
+            'build-server.service': {
+                'Unit': {
+                    'Description': 'build server',
+                    'After': 'network.target',
+                },
+                'Service': {
+                    'User': 'build-server',
+                    'Group': 'build-server',
+                    'Environment': 'STRATEGIES_DIR=/opt/build-server/strategies',
+                    'WorkingDirectory': '/var/lib/build-server',
+                    'ExecStart': '/opt/build-server/build-server-crystal --port 4000',
+                    'Restart': 'always',
+                },
+                'Install': {
+                    'WantedBy': {'multi-user.target'},
+                },
             },
         },
     },