diff --git a/src/com/sompani/onboarding.clj b/src/com/sompani/onboarding.clj
index 48a5cbb..ad1baff 100644
--- a/src/com/sompani/onboarding.clj
+++ b/src/com/sompani/onboarding.clj
@@ -29,7 +29,7 @@
           (recur))))
     (.waitFor process)))
 
-(def driver (FirefoxDriver.))
+(def driver (atom nil))
 
 ;; # AWS Domain
 (declare make-dns-entries!)
@@ -141,7 +141,7 @@
 ;; ## nginx configuration
 
 (defn create-nginx-server! [datamap]
-  (printf "Creating nginx entries for $s." (:company-name datamap))
+  (printf "Creating nginx entries for %n." (:company-name datamap))
   (doseq [file ["skel.talent.careers"
                 "staging.skel.talent.careers"]
           :let [in-file (str "resources/nginx/" file)
@@ -154,13 +154,14 @@
 ;; ## Certificates
 (defn generate-certs! [{:keys [company-name company-domain] :as datamap}]
   (println "Generating certificates...")
-  (apply sh (map #(cljstache/render % datamap)
-                 ["certbot" "certonly" "--nginx"
-                  "-d" "staging.{{company-name}}.talent.careers"
-                  "-d" "{{company-name}}.talent.careers"
-                  "-d" "talent.{{company-domain}}"
-                  "-d" "www.talent.{{company-domain}}"
-                  "--cert-name" "{{company-name}}"]))
+  (let [command (map #(cljstache/render % datamap)
+                     ["certbot" "certonly" "--nginx"
+                      "-d" "staging.{{company-name}}.talent.careers"
+                      "-d" "{{company-name}}.talent.careers"
+                      "-d" "talent.{{company-domain}}"
+                      "-d" "www.talent.{{company-domain}}"
+                      "--cert-name" "{{company-name}}"])]
+    (apply sh command))
   (println "ok."))
 
 ;; # DNS configuration
@@ -220,7 +221,8 @@
         datamap {:company-name vc-name "company-domain" vc-domain}]
     (and deploy-directories (make-dirs! datamap))
     (and base-dns (make-basic-dns-entries! datamap))
-    (and aws-domain (do (aws-login)
+    (and aws-domain (do (reset! driver (FirefoxDriver.))
+                        (aws-login)
                         (Thread/sleep 5000)
                         (aws-verify-domain-dns datamap)
                         (aws-verify-domain-mailfrom datamap)))