diff --git a/4a-install-tls-self-signed-nginx.sh b/4a-install-tls-self-signed-nginx.sh
index 9d9766c..de885ec 100644
--- a/4a-install-tls-self-signed-nginx.sh
+++ b/4a-install-tls-self-signed-nginx.sh
@@ -50,6 +50,12 @@ PROXY_SITE=
 CERT_DAYS=
 DEFAULT_IP=
 
+# Create a place to save the certs so we don't overwrite any earlier versions
+CERT_DIR_NAME=tls-certs-$(date +%y.%m.%d-%H_%M)
+CERT_DIR=$DOWNLOAD_DIR/$CERT_DIR_NAME
+mkdir -p $CERT_DIR
+cd $CERT_DIR
+
 # Setup script cmd line arguments for proxy site and certificate days
 TLSNAME=$1
 TLSDAYS=$2
diff --git a/guac-management/refresh-tls-self-signed.sh b/guac-management/refresh-tls-self-signed.sh
index 3032dc6..3a52360 100644
--- a/guac-management/refresh-tls-self-signed.sh
+++ b/guac-management/refresh-tls-self-signed.sh
@@ -35,11 +35,12 @@ echo
 echo -e "${LGREEN}Cresting self signed TLS certificates for Nginx...${GREY}"
 echo
 
+# Create a place to save the certs so we don't overwrite any earlier versions
 USER_HOME_DIR=$(eval echo ~${SUDO_USER})
-CERT_DIR=tls-certs-$(date +%y.%m.%d-%H_%M)
-WORKING_DIR=$USER_HOME_DIR/guac-setup/$CERT_DIR
-mkdir -p $WORKING_DIR
-cd $WORKING_DIR
+CERT_DIR_NAME=tls-certs-$(date +%y.%m.%d-%H_%M)
+CERT_DIR=$USER_HOME_DIR/guac-setup/$CERT_DIR_NAME
+mkdir -p $CERT_DIR
+cd $CERT_DIR
 
 # Set default certificate file destinations. Change these for other TLS applications.
 DIR_SSL_KEY="/etc/nginx/ssl/private"