diff --git a/services/acme-cert-store.nix b/services/acme-cert-store.nix
index 30f24ce..7c92b27 100644
--- a/services/acme-cert-store.nix
+++ b/services/acme-cert-store.nix
@@ -6,6 +6,7 @@
     openssh.authorizedKeys.keys = config.users.users.root.openssh.authorizedKeys.keys ++ [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHj2PK6LHsanSqaz8Gf/VqHaurd5e6Y7KnZNBiHb9adT nextcloud"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDiJZWlmiEkVzlf5/KV/jKkCGlgp8mnEeCnwk/dhdctJ gitea"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOgIXTr7HxC13UNZP0UCALBRJuiDh4U0Nnd4GPIE4RQR vaultwarden"
     ];
   };
 
diff --git a/services/acme-dns.nix b/services/acme-dns.nix
deleted file mode 100644
index 9d9d485..0000000
--- a/services/acme-dns.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-{
-  security.acme = {
-    acceptTerms = true;
-    defaults = {
-      email = "vili.m.sinerva@gmail.com";
-      environmentFile = "/var/lib/acme/dns-creds";
-      dnsProvider = "ovh";
-      group = "nginx";
-      extraLegoFlags = [
-        "--dns.propagation-wait"
-        "60s"
-      ];
-    };
-  };
-}
diff --git a/services/vaultwarden.nix b/services/vaultwarden.nix
index 681f756..368146d 100644
--- a/services/vaultwarden.nix
+++ b/services/vaultwarden.nix
@@ -1,11 +1,8 @@
 { ... }:
 {
-  imports = [ ./acme-dns.nix ];
+  imports = [ ./cert-store-client.nix ];
 
-  networking.firewall.allowedTCPPorts = [
-    80
-    443
-  ];
+  networking.firewall.allowedTCPPorts = [ 443 ];
   networking.firewall.allowedUDPPorts = [ 443 ];
 
   services = {
@@ -43,8 +40,8 @@
       virtualHosts."vaultwarden.vsinerva.fi" = {
         forceSSL = true;
         kTLS = true;
-        enableACME = true;
-        acmeRoot = null;
+        sslCertificate = "/mnt/acme/fullchain.pem";
+        sslCertificateKey = "/mnt/acme/key.pem";
         locations."/" = {
           proxyPass = "http://localhost:8000";
         };