diff --git a/targets/nixos-wiki2.thalheim.io/apply.sh b/targets/nixos-wiki.nixos.org/apply.sh
similarity index 100%
rename from targets/nixos-wiki2.thalheim.io/apply.sh
rename to targets/nixos-wiki.nixos.org/apply.sh
diff --git a/targets/nixos-wiki2.thalheim.io/configuration.nix b/targets/nixos-wiki.nixos.org/configuration.nix
similarity index 95%
rename from targets/nixos-wiki2.thalheim.io/configuration.nix
rename to targets/nixos-wiki.nixos.org/configuration.nix
index eec88d0..94aff7e 100644
--- a/targets/nixos-wiki2.thalheim.io/configuration.nix
+++ b/targets/nixos-wiki.nixos.org/configuration.nix
@@ -16,7 +16,7 @@ in
   sops.secrets.nixos-wiki-github-client-secret.owner = config.services.phpfpm.pools.mediawiki.user;
 
   services.nixos-wiki = {
-    hostname = "nixos-wiki2.thalheim.io";
+    hostname = "wiki.staging.julienmalka.me";
     adminPasswordFile = config.sops.secrets.nixos-wiki.path;
     githubClientId = "Iv1.95ed182c83df1d22";
     githubClientSecretFile = config.sops.secrets.nixos-wiki-github-client-secret.path;
diff --git a/targets/nixos-wiki2.thalheim.io/nixos-vars.json b/targets/nixos-wiki.nixos.org/nixos-vars.json
similarity index 74%
rename from targets/nixos-wiki2.thalheim.io/nixos-vars.json
rename to targets/nixos-wiki.nixos.org/nixos-vars.json
index 56cb07a..0184bc0 100644
--- a/targets/nixos-wiki2.thalheim.io/nixos-vars.json
+++ b/targets/nixos-wiki.nixos.org/nixos-vars.json
@@ -1 +1 @@
-{"ipv6_address":"2a01:4f9:c012:4fe3::1","ssh_keys":["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine","ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDMBW7rTtfZL9wtrpCVgariKdpN60/VeAzXkh9w3MwbO julien@enigma"]}
\ No newline at end of file
+{"ipv6_address":"2a01:4f9:c012:8178::1","ssh_keys":["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine","ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDMBW7rTtfZL9wtrpCVgariKdpN60/VeAzXkh9w3MwbO julien@enigma"]}
\ No newline at end of file
diff --git a/targets/nixos-wiki2.thalheim.io/secrets.yaml b/targets/nixos-wiki.nixos.org/secrets.yaml
similarity index 100%
rename from targets/nixos-wiki2.thalheim.io/secrets.yaml
rename to targets/nixos-wiki.nixos.org/secrets.yaml
diff --git a/targets/nixos-wiki2.thalheim.io/terraform.tf b/targets/nixos-wiki.nixos.org/terraform.tf
similarity index 90%
rename from targets/nixos-wiki2.thalheim.io/terraform.tf
rename to targets/nixos-wiki.nixos.org/terraform.tf
index b3ce9e5..5c68225 100644
--- a/targets/nixos-wiki2.thalheim.io/terraform.tf
+++ b/targets/nixos-wiki.nixos.org/terraform.tf
@@ -12,12 +12,12 @@ terraform {
 module "wiki" {
   source           = "../../terraform/nixos-wiki"
   domain           = "nixos-wiki2.thalheim.io"
-  nixos_flake_attr = "nixos-wiki2-thalheim-io"
+  nixos_flake_attr = "nixos-wiki-nixos-org"
   nixos_vars_file  = "${path.module}/nixos-vars.json"
   sops_file        = abspath("${path.module}/secrets.yaml")
   tags = {
     Terraform = "true"
-    Target    = "nixos-wiki2.thalheim.io"
+    Target    = "wiki.nixos.org"
   }
 }