diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index f2e9d3ae..4064aa3f 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -885,11 +885,22 @@ if [ -f $MESH_INSTALL_SETUP ]; then
         rm -rf /home/$MY_USERNAME/.ssb
     fi
 
-    # Remove vpn keys
+    # Remove vpn host keys
     if [ -d /etc/openvpn/easy-rsa/keys ]; then
         rm -rf /etc/openvpn/easy-rsa/keys/*
     fi
 
+    # Remove any existing vpn client keys
+    if [ -f /home/$MY_USERNAME/vpn.tar.gz ]; then
+        rm /home/$MY_USERNAME/vpn.tar.gz
+    fi
+    if [ -f /home/$USERNAME/stunnel.pem ]; then
+        rm /home/$USERNAME/stunnel.pem
+    fi
+    if [ -f /home/$USERNAME/stunnel.p12 ]; then
+        rm /home/$USERNAME/stunnel.p12
+    fi
+
     # Remove cryptpad datastore
     if [ -d $CRYPTPAD_DIR/datastore ]; then
         rm -rf $CRYPTPAD_DIR/datastore