diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 96337813..02d4e5d6 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -74,7 +74,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
     else:
         logging.getLogger("paramiko").setLevel(logging.WARN)
 
-    sshinfo = vmtools.get_clean_builder('builder', options.reset_server)
+    sshinfo = vmtools.get_clean_builder('builder')
 
     output = None
     try:
@@ -295,7 +295,8 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
     finally:
         # Suspend the build server.
         vm = vmtools.get_build_vm('builder')
-        vm.suspend()
+        logging.info('destroying buildserver after build')
+        vm.destroy()
 
         # deploy logfile to repository web server
         if output:
diff --git a/fdroidserver/vmtools.py b/fdroidserver/vmtools.py
index b32502f0..c231aacc 100644
--- a/fdroidserver/vmtools.py
+++ b/fdroidserver/vmtools.py
@@ -33,7 +33,7 @@ import threading
 lock = threading.Lock()
 
 
-def get_clean_builder(serverdir, reset=False):
+def get_clean_builder(serverdir):
     if not os.path.isdir(serverdir):
         if os.path.islink(serverdir):
             os.unlink(serverdir)
@@ -51,26 +51,9 @@ def get_clean_builder(serverdir, reset=False):
                 end
                 """))
     vm = get_build_vm(serverdir)
-    if reset:
-        logging.info('resetting buildserver by request')
-    elif not vm.vagrant_uuid_okay():
-        logging.info('resetting buildserver, because vagrant vm is not okay.')
-        reset = True
-    elif not vm.snapshot_exists('fdroidclean'):
-        logging.info("resetting buildserver, because snapshot 'fdroidclean' is not present.")
-        reset = True
-
-    if reset:
-        vm.destroy()
-    vm.up()
-    vm.suspend()
-
-    if reset:
-        logging.info('buildserver recreated: taking a clean snapshot')
-        vm.snapshot_create('fdroidclean')
-    else:
-        logging.info('builserver ok: reverting to clean snapshot')
-        vm.snapshot_revert('fdroidclean')
+    logging.info('destroying buildserver before build')
+    vm.destroy()
+    logging.info('starting buildserver')
     vm.up()
 
     try: