diff --git a/src/freedombone-factory-reset b/src/freedombone-factory-reset
index 5c91aeadaf6e2d49f2bddbcdd4ffc6459cab37f7..71380ab50cc372cc86d08e17c422993915592394 100755
--- a/src/freedombone-factory-reset
+++ b/src/freedombone-factory-reset
@@ -159,15 +159,6 @@ awk '$5 > 2000' /etc/ssh/moduli > ~/moduli
 mv ~/moduli /etc/ssh/moduli
 echo $'ssh small moduli removed'
 
-# regenerate tor keys
-systemctl stop tor
-$REMOVE_PACKAGES tor
-if [ -d /var/lib/tor ]; then
-    rm -rf /var/lib/tor
-fi
-$INSTALL_PACKAGES_BACKPORTS tor
-echo $'Tor keys regenerated'
-
 $REMOVE_UNUSED_PACKAGES
 $CLEAN_PACKAGES
 /bin/rm -rf /var/lib/apt/lists/*
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index be1664c0192beccac2e1c1a5ff9d20aab91c762d..c464f2b6d535c51777e721c885c6aaaed4466d34 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -346,6 +346,15 @@ function install_tor {
         return
     fi
 
+    # ensure that any previous keys are removed
+    if [ -d /var/lib/tor ]; then
+        $REMOVE_PACKAGES tor
+        rm -rf /var/lib/tor
+    fi
+    if [ -d /etc/torrc.d ]; then
+        rm -rf /etc/torrc.d/*
+    fi
+
     $INSTALL_PACKAGES_BACKPORTS tor
     if [ ! -f /etc/tor/torrc ]; then
         echo 'Tor failed to install'