diff --git a/src/Commands/Check.php b/src/Commands/Check.php
index b89cfbb..6dbdd7a 100644
--- a/src/Commands/Check.php
+++ b/src/Commands/Check.php
@@ -23,7 +23,10 @@ class Check implements Command {
      * @return \Generator
      */
     private function doExecute(Manager $args) {
-        $path = dirname(dirname(__DIR__)) . "/data/certs";
+        $server = \Kelunik\AcmeClient\resolveServer($args->get("server"));
+        $server = \Kelunik\AcmeClient\serverToKeyname($server);
+
+        $path = dirname(dirname(__DIR__)) . "/data/certs/" . $server;
         $certificateStore = new CertificateStore($path);
 
         $pem = (yield $certificateStore->get($args->get("name")));
@@ -42,6 +45,12 @@ class Check implements Command {
 
     public static function getDefinition() {
         return [
+            "server" => [
+                "prefix" => "s",
+                "longPrefix" => "server",
+                "description" => "",
+                "required" => true,
+            ],
             "name" => [
                 "longPrefix" => "name",
                 "description" => "Common name of the certificate to check.",
diff --git a/src/Commands/Issue.php b/src/Commands/Issue.php
index 53d2523..4ca40d8 100644
--- a/src/Commands/Issue.php
+++ b/src/Commands/Issue.php
@@ -116,7 +116,7 @@ class Issue implements Command {
         $location = (yield $acme->requestCertificate($keyPair, $domains));
         $certificates = (yield $acme->pollForCertificate($location));
 
-        $path = dirname(dirname(__DIR__)) . "/data/certs";
+        $path = dirname(dirname(__DIR__)) . "/data/certs/" . $keyFile;
         $certificateStore = new CertificateStore($path);
         yield $certificateStore->put($certificates);
 
diff --git a/src/Commands/Revoke.php b/src/Commands/Revoke.php
index 3a7dac8..06f54ca 100644
--- a/src/Commands/Revoke.php
+++ b/src/Commands/Revoke.php
@@ -51,7 +51,7 @@ class Revoke implements Command {
         yield $acme->revokeCertificate($pem);
         $this->logger->info("Certificate has been revoked.");
 
-        yield (new CertificateStore(dirname(dirname(__DIR__)) . "/data/certs"))->delete($args->get("name"));
+        yield (new CertificateStore(dirname(dirname(__DIR__)) . "/data/certs/" . $keyFile))->delete($args->get("name"));
     }
 
     public static function getDefinition() {