diff --git a/bors.toml b/bors.toml
index 0b93280..54f90de 100644
--- a/bors.toml
+++ b/bors.toml
@@ -2,5 +2,7 @@ cut_body_after = "" # don't include text from the PR body in the merge commit me
 status = [
   "Evaluate flake.nix",
   "check treefmt [x86_64-linux]",
-  "package default [x86_64-linux]"
+  "package default [x86_64-linux]",
+  "nixosConfig nixos-wiki-thalheim-io",
+  "nixosConfig staging-nixos-wiki-thalheim-io",
 ]
diff --git a/targets/flake-module.nix b/targets/flake-module.nix
index 9e0e92f..046dd1c 100644
--- a/targets/flake-module.nix
+++ b/targets/flake-module.nix
@@ -8,7 +8,7 @@ in
     (builtins.map
       (name:
         lib.nameValuePair
-          name
+          (builtins.replaceStrings [ "." ] [ "-" ] name)
           (lib.nixosSystem {
             system = "x86_64-linux";
             # Make flake available in modules
diff --git a/targets/nixos-wiki.thalheim.io/terraform.tf b/targets/nixos-wiki.thalheim.io/terraform.tf
index cbfc547..7270afd 100644
--- a/targets/nixos-wiki.thalheim.io/terraform.tf
+++ b/targets/nixos-wiki.thalheim.io/terraform.tf
@@ -13,7 +13,7 @@ module "wiki" {
   source           = "../../terraform/nixos-wiki"
   netlify_dns_zone = "nixos-wiki.thalheim.io"
   domain           = "nixos-wiki.thalheim.io"
-  nixos_flake_attr = "nixos-wiki-production"
+  nixos_flake_attr = "nixos-wiki-thalheim-io"
   nixos_vars_file  = "${path.module}/nixos-vars.json"
   tags = {
     Terraform = "true"
diff --git a/targets/staging.nixos-wiki.thalheim.io/terraform.tf b/targets/staging.nixos-wiki.thalheim.io/terraform.tf
index fecdc5c..23d6548 100644
--- a/targets/staging.nixos-wiki.thalheim.io/terraform.tf
+++ b/targets/staging.nixos-wiki.thalheim.io/terraform.tf
@@ -12,7 +12,7 @@ terraform {
 module "wiki" {
   source           = "../../terraform/nixos-wiki"
   netlify_dns_zone = "nixos-wiki.thalheim.io"
-  nixos_flake_attr = "nixos-wiki-staging"
+  nixos_flake_attr = "nixos-wiki-thalheim-io"
   nixos_vars_file  = "${path.module}/nixos-vars.json"
   tags = {
     Terraform = "true"