diff --git a/applyset-deploy.sh b/applyset-deploy.sh
index e5b1232..397cfbb 100644
--- a/applyset-deploy.sh
+++ b/applyset-deploy.sh
@@ -23,7 +23,7 @@ done
 
 first_server="${SERVERS%% *}"
 previous_manifest=$(
-	envsubst <<EOF | ssh -T "root@$first_server"
+	envsubst <<EOF | ssh -T "root@$first_server.dmz"
         if [[ -f "$GCROOTDIR/$NAME.yml" ]]; then
                 cat "$GCROOTDIR/$NAME.yml"
         fi
diff --git a/modules/inbucket.nix b/modules/inbucket.nix
index 7fbc481..947ccb9 100644
--- a/modules/inbucket.nix
+++ b/modules/inbucket.nix
@@ -21,7 +21,14 @@
 
             containers.inbucket = {
               image = globals.images.inbucket;
-
+              env = {
+                INBUCKET_MAILBOXNAMING.value = "full";
+                INBUCKET_SMTP_DEFAULTACCEPT.value = "false";
+                INBUCKET_SMTP_ACCEPTDOMAINS.value = "kunis.nl,kun.is";
+                INBUCKET_SMTP_DEFAULTSTORE.value = "false";
+                INBUCKET_SMTP_STOREDOMAINS.value = "kunis.nl,kun.is";
+                INBUCKET_STORAGE_RETENTIONPERIOD.value = "168h";
+              };
               ports = {
                 web.containerPort = 9000;
                 smtp.containerPort = 2500;
diff --git a/scripts/gen-k3s-cert.sh b/scripts/gen-k3s-cert.sh
index 405f9f9..71ad441 100644
--- a/scripts/gen-k3s-cert.sh
+++ b/scripts/gen-k3s-cert.sh
@@ -13,6 +13,11 @@ if [ -z "$username" ] || [ -z "$host" ]
     exit 1
 fi
 
+if [ ! -d "$output_path" ]; then
+    echo "Output directory $output_path does not exist!"
+    exit 1
+fi
+
 # Create a temporary directory
 temp=$(mktemp -d)