diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml
index 4a086457..e674db49 100644
--- a/.forgejo/workflows/ci.yaml
+++ b/.forgejo/workflows/ci.yaml
@@ -19,7 +19,7 @@ jobs:
     runs-on: native
     steps:
       - uses: actions/checkout@v4
-      - run: cd services && nix-build -A tests
+      - run: cd services && nix-build -A tests.peertube
 
   check-panel:
     runs-on: native
diff --git a/infra/dev/main.tf b/infra/dev/main.tf
index fcb34b58..d9458886 100644
--- a/infra/dev/main.tf
+++ b/infra/dev/main.tf
@@ -8,7 +8,7 @@ module "nixos" {
   vm_domain = local.vm_domain
   hostname = each.value.hostname
   config_nix = each.value.config_nix
-  config_tf = each.value.config_nix
+  config_tf = each.value.config_tf
 
   for_each = { for name, inst in {
     wiki = "vm02187"
@@ -18,7 +18,7 @@ module "nixos" {
     demo = "fedi201"
   } : name => {
       hostname = inst
-      config_nix = {
+      config_tf = {
         terraform = {
           domain = local.vm_domain
           hostname = inst
diff --git a/infra/operator/main.tf b/infra/operator/main.tf
index fe8b2ccb..08612136 100644
--- a/infra/operator/main.tf
+++ b/infra/operator/main.tf
@@ -35,15 +35,15 @@ module "nixos" {
   vm_domain = local.vm_domain
   hostname = each.value.hostname
   config_nix = each.value.config_nix
-  config_tf = each.value.config_nix
+  config_tf = each.value.config_tf
 
   for_each = {for name, inst in merge(
     local.peripherals,
     local.application_configs,
   ) : name => merge(inst, {
-    config_nix = {
+    config_tf = {
       terraform = {
-        domain = local.vm_domain
+        domain = var.domain
         hostname = inst.hostname
         initialUser = var.initialUser
       }
@@ -57,14 +57,14 @@ module "nixos" {
           # FIXME: separate template options by service
           ${path.root}/options.nix
           # for service `mastodon` import `mastodon.nix`
-          ${path.root}/../../machines/operator/${name}.nix
+          ${path.root}/../../machines/operator/${inst.hostname}/${name}.nix
           # FIXME: get VM details from TF
           ${path.root}/../../machines/operator/${inst.hostname}
         ];
         ## FIXME: switch root authentication to users with password-less sudo, see #24
         users.users.root.openssh.authorizedKeys.keys = let
-          keys = import ../keys;
-        in attrValues keys.contributors ++ [
+          keys = import ../../keys;
+        in builtins.attrValues keys.contributors ++ [
           # allow our panel vm access to the test machines
           keys.panel
         ];
diff --git a/npins/sources.json b/npins/sources.json
index 7a99f972..cbdcd1dc 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -42,19 +42,6 @@
       "url": "https://github.com/fricklerhandwerk/flake-inputs/archive/559574c9cbb8af262f3944b67d60fbf0f6ad03c3.tar.gz",
       "hash": "0gbhmp6x2vdzvfnsvqzal3g8f8hx2ia6r73aibc78kazf78m67x6"
     },
-    "flake-parts": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "hercules-ci",
-        "repo": "flake-parts"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "c621e8422220273271f52058f618c94e405bb0f5",
-      "url": "https://github.com/hercules-ci/flake-parts/archive/c621e8422220273271f52058f618c94e405bb0f5.tar.gz",
-      "hash": "09j2dafd75ydlcw8v48vcpfm2mw0j6cs8286x2hha2lr08d232w4"
-    },
     "git-hooks": {
       "type": "Git",
       "repository": {