diff --git a/tesla-mate-container.nix b/tesla-mate-container.nix
index 587b37d..71f8d1e 100644
--- a/tesla-mate-container.nix
+++ b/tesla-mate-container.nix
@@ -19,28 +19,34 @@ let
       project.name = "teslamate";
       services = {
         teslamate = {
-          image = teslaMateImage;
-          restart = "always";
-          volumes = [ "${stateDirectory}/import:/opt/app/import" ];
-          ports = [ "4000:4000" ];
-          user = [ "${teslaMateUid}:${teslaMateUid}" ];
-          env_file = [ teslaMateEnvFile ];
-          cap_drop = "all";
+          service = {
+            image = teslaMateImage;
+            restart = "always";
+            volumes = [ "${stateDirectory}/import:/opt/app/import" ];
+            ports = [ "4000:4000" ];
+            user = [ "${teslaMateUid}:${teslaMateUid}" ];
+            env_file = [ teslaMateEnvFile ];
+            cap_drop = "all";
+          };
         };
         postgres = {
-          image = postgresImage;
-          restart = "always";
-          volumes = [ "${stateDirectory}/postgres:/var/lib/postgresql/data" ];
-          env_file = [ postgresEnvFile ];
-          user = [ "${postgresUid}:${postgresUid}" ];
+          service = {
+            image = postgresImage;
+            restart = "always";
+            volumes = [ "${stateDirectory}/postgres:/var/lib/postgresql/data" ];
+            env_file = [ postgresEnvFile ];
+            user = [ "${postgresUid}:${postgresUid}" ];
+          };
         };
         grafana = {
-          image = grafanaImage;
-          restart = "always";
-          volumes = [ "${stateDirectory}/grafana:/var/lib/grafana" ];
-          env_file = [ grafanaEnvFile ];
-          user = [ "${grafanaUid}:${grafanaUid}" ];
-          ports = [ "3000:3000" ];
+          service = {
+            image = grafanaImage;
+            restart = "always";
+            volumes = [ "${stateDirectory}/grafana:/var/lib/grafana" ];
+            env_file = [ grafanaEnvFile ];
+            user = [ "${grafanaUid}:${grafanaUid}" ];
+            ports = [ "3000:3000" ];
+          };
         };
       };
     };