diff --git a/hosts/binarycache/configuration.nix b/hosts/binarycache/configuration.nix
index db8693fc..6988df30 100644
--- a/hosts/binarycache/configuration.nix
+++ b/hosts/binarycache/configuration.nix
@@ -28,7 +28,6 @@
       user-jrautiola
       user-cazfi
       user-hrosten
-      user-mkaapu
       user-avnik
     ]);
 
diff --git a/hosts/builders/ficolo.nix b/hosts/builders/ficolo.nix
index 294da1d3..68dc54a7 100644
--- a/hosts/builders/ficolo.nix
+++ b/hosts/builders/ficolo.nix
@@ -19,9 +19,7 @@
       user-cazfi
       user-hrosten
       user-jrautiola
-      user-mkaapu
       user-karim
-      user-mika
     ]);
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/hosts/builders/hetzarm/configuration.nix b/hosts/builders/hetzarm/configuration.nix
index 2c4c3f04..6837f86d 100644
--- a/hosts/builders/hetzarm/configuration.nix
+++ b/hosts/builders/hetzarm/configuration.nix
@@ -23,9 +23,7 @@
       user-cazfi
       user-hrosten
       user-jrautiola
-      user-mkaapu
       user-karim
-      user-mika
       user-github
       user-remote-build
     ]);
diff --git a/hosts/ghaf-log/configuration.nix b/hosts/ghaf-log/configuration.nix
index 72a8e9b8..ff2c18c9 100644
--- a/hosts/ghaf-log/configuration.nix
+++ b/hosts/ghaf-log/configuration.nix
@@ -26,7 +26,6 @@
       user-cazfi
       user-hrosten
       user-karim
-      user-mkaapu
       user-ktu
       user-bmg
       user-vunnyso
diff --git a/hosts/ghaf-proxy/configuration.nix b/hosts/ghaf-proxy/configuration.nix
index 69e9b6dd..43a8eb85 100644
--- a/hosts/ghaf-proxy/configuration.nix
+++ b/hosts/ghaf-proxy/configuration.nix
@@ -25,12 +25,10 @@
       user-fayad
       user-cazfi
       user-karim
-      user-mika
       user-bmg
       user-flokli
       user-hrosten
       user-ktu
-      user-mkaapu
       user-vjuntunen
       user-alextserepov
     ]);
diff --git a/hosts/himalia/configuration.nix b/hosts/himalia/configuration.nix
index 4c6e0cfd..19c6fe2b 100644
--- a/hosts/himalia/configuration.nix
+++ b/hosts/himalia/configuration.nix
@@ -21,7 +21,6 @@
       user-cazfi
       user-karim
       user-barna
-      user-mika
     ]);
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/hosts/testagent/release/configuration.nix b/hosts/testagent/release/configuration.nix
index 07e6a63c..a86d60e8 100644
--- a/hosts/testagent/release/configuration.nix
+++ b/hosts/testagent/release/configuration.nix
@@ -27,7 +27,6 @@
       user-ktu
       user-cazfi
       user-karim
-      user-mika
     ]);
 
   sops.defaultSopsFile = ./secrets.yaml;
diff --git a/ssh-keys.yaml b/ssh-keys.yaml
index 2f8c45a4..24334580 100644
--- a/ssh-keys.yaml
+++ b/ssh-keys.yaml
@@ -10,11 +10,6 @@ hrosten:
 jrautiola:
  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGlFqSQFoSSuAS1IjmWBFXie329I5Aqf71QhVOnLTBG+ joonas@x1
  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB3h/Aj66ndKFtqpQ8H53tE9KbbO0obThC0qbQQKFQRr joonas@zeus
-mkaapu:
- - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYpWmLovw4yIfjhWZ75PgtVfk9ZUcYHRLORcDltoufa mkaapu@nixzure
- - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE6WDXGfrD+WfY2+eP+/c4NrEOeCGpEOE2TcTlwxWXho marko.kaapu@unikie.com
-mika:
- - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKoroafXsrWkoLewJ7EYcHodqlYILV2T8xtRo6RL99vz mika@nixos
 karim:
  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOWo1W2XgAYxqntPxdI0k7K/3EgWB6lAaPkEwUwUT2Ey karim@nixos
 cazfi:
@@ -25,4 +20,4 @@ vjuntunen:
 ktu:
  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBeMFr++WulL/hQKejDnE1ePRQscLp7LvLAy/DyLW4AU
 alextserepov:
-- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJvQdncdNCFMw7f0Xln40H/u0fJp82tVrQMEHtSdvP6m aleksandr.tserepov-savolainen@unikie.com
\ No newline at end of file
+- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJvQdncdNCFMw7f0Xln40H/u0fJp82tVrQMEHtSdvP6m aleksandr.tserepov-savolainen@unikie.com
diff --git a/terraform/binary-cache.tf b/terraform/binary-cache.tf
index 52dfcae1..388a9aab 100644
--- a/terraform/binary-cache.tf
+++ b/terraform/binary-cache.tf
@@ -31,7 +31,7 @@ module "binary_cache_vm" {
 
   virtual_machine_custom_data = join("\n", ["#cloud-config", yamlencode({
     users = [
-      for user in toset(["bmg", "flokli", "hrosten", "jrautiola", "vjuntunen", "mkaapu", "karim", "cazfi", "mika"]) : {
+      for user in toset(["bmg", "flokli", "hrosten", "jrautiola", "vjuntunen", "karim", "cazfi"]) : {
         name                = user
         sudo                = "ALL=(ALL) NOPASSWD:ALL"
         ssh_authorized_keys = local.ssh_keys[user]
diff --git a/terraform/jenkins-controller.tf b/terraform/jenkins-controller.tf
index 5066f976..19dd5c04 100644
--- a/terraform/jenkins-controller.tf
+++ b/terraform/jenkins-controller.tf
@@ -33,7 +33,7 @@ module "jenkins_controller_vm" {
 
   virtual_machine_custom_data = join("\n", ["#cloud-config", yamlencode({
     users = [
-      for user in toset(["bmg", "flokli", "hrosten", "jrautiola", "mkaapu", "mika", "karim", "cazfi", "vjuntunen", "ktu", "alextserepov"]) : {
+      for user in toset(["bmg", "flokli", "hrosten", "jrautiola", "karim", "cazfi", "vjuntunen", "ktu", "alextserepov"]) : {
         name                = user
         sudo                = "ALL=(ALL) NOPASSWD:ALL"
         ssh_authorized_keys = local.ssh_keys[user]
diff --git a/users/default.nix b/users/default.nix
index 98213656..bbb47ace 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -5,10 +5,8 @@
     user-hrosten = import ./hrosten.nix;
     user-jrautiola = import ./jrautiola.nix;
     user-cazfi = import ./cazfi.nix;
-    user-mkaapu = import ./mkaapu.nix;
     user-karim = import ./karim.nix;
     user-barna = import ./barna.nix;
-    user-mika = import ./mika.nix;
     user-ktu = import ./ktu.nix;
     user-avnik = import ./avnik.nix;
     user-flokli = import ./flokli.nix;
diff --git a/users/mika.nix b/users/mika.nix
deleted file mode 100644
index 77777fb1..00000000
--- a/users/mika.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
-# SPDX-License-Identifier: Apache-2.0
-{
-  users.users = {
-    mika = {
-      description = "Mika Nokka";
-      isNormalUser = true;
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKoroafXsrWkoLewJ7EYcHodqlYILV2T8xtRo6RL99vz mika@nixos"
-      ];
-      extraGroups = [
-        "wheel"
-        "networkmanager"
-        "docker"
-      ];
-    };
-  };
-}
diff --git a/users/mkaapu.nix b/users/mkaapu.nix
deleted file mode 100644
index 92811e4b..00000000
--- a/users/mkaapu.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
-# SPDX-License-Identifier: Apache-2.0
-{
-  users.users = {
-    mkaapu = {
-      description = "Marko Kaapu";
-      isNormalUser = true;
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE6WDXGfrD+WfY2+eP+/c4NrEOeCGpEOE2TcTlwxWXho marko.kaapu@unikie.com"
-      ];
-      extraGroups = [
-        "wheel"
-        "networkmanager"
-      ];
-    };
-  };
-}