diff --git a/ops/nixos/marukuru/default.nix b/ops/nixos/marukuru/default.nix
index 16b0054638..761e1396b8 100644
--- a/ops/nixos/marukuru/default.nix
+++ b/ops/nixos/marukuru/default.nix
@@ -109,40 +109,42 @@ in {
     email = "letsencrypt@lukegb.com";
   };
 
-  docker-containers.heptapod-runner = {
-    image = "octobus/heptapod-runner:0.2.0";
-    volumes = [
-      "/srv/gitlab-runner/config:/etc/gitlab-runner"
-      "/var/run/docker.sock:/var/run/docker.sock"
-    ];
-  };
-  docker-containers.heptapod = {
-    #image = "octobus/heptapod:0.13.0-py3";
-    image = "heptapod:latest";
-    ports = [
-      # host:container
-      "22:22"
-      "80:80"
-      "443:443"
-    ];
-    volumes = [
-      "/srv/gitlab/config:/etc/gitlab"
-      "/srv/gitlab/logs:/var/log/gitlab"
-      "/srv/gitlab/data:/var/opt/gitlab"
-    ];
-    environment = {
-      GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings ["\n"] [";"] ''
-        external_url "https://hg.lukegb.com"
-        letsencrypt['enable'] = true
-        letsencrypt['contact_emails'] = ['letsencrypt@lukegb.com']
-        nginx['redirect_http_to_https'] = true
+  virtualisation.oci-containers.containers = {
+    heptapod-runner = {
+      image = "octobus/heptapod-runner:0.2.0";
+      volumes = [
+        "/srv/gitlab-runner/config:/etc/gitlab-runner"
+        "/var/run/docker.sock:/var/run/docker.sock"
+      ];
+    };
+    heptapod = {
+      #image = "octobus/heptapod:0.13.0-py3";
+      image = "heptapod:latest";
+      ports = [
+        # host:container
+        "22:22"
+        "80:80"
+        "443:443"
+      ];
+      volumes = [
+        "/srv/gitlab/config:/etc/gitlab"
+        "/srv/gitlab/logs:/var/log/gitlab"
+        "/srv/gitlab/data:/var/opt/gitlab"
+      ];
+      environment = {
+        GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings ["\n"] [";"] ''
+          external_url "https://hg.lukegb.com"
+          letsencrypt['enable'] = true
+          letsencrypt['contact_emails'] = ['letsencrypt@lukegb.com']
+          nginx['redirect_http_to_https'] = true
 
-        gitlab_rails['smtp_enable'] = true
-        gitlab_rails['smtp_address'] = '103.105.48.15'
-        gitlab_rails['smtp_port'] = 25
-        gitlab_rails['gitlab_email_from'] = 'heptapod@hg.lukegb.com'
-        gitlab_rails['gitlab_email_reply_to'] = 'noreply@hg.lukegb.com'
-      '';
+          gitlab_rails['smtp_enable'] = true
+          gitlab_rails['smtp_address'] = '103.105.48.15'
+          gitlab_rails['smtp_port'] = 25
+          gitlab_rails['gitlab_email_from'] = 'heptapod@hg.lukegb.com'
+          gitlab_rails['gitlab_email_reply_to'] = 'noreply@hg.lukegb.com'
+        '';
+      };
     };
   };
 
@@ -201,4 +203,4 @@ in {
   };
 
   system.stateVersion = "20.03";
-}
\ No newline at end of file
+}