diff --git a/nginx-setup.sh b/01-nginx-setup.sh
similarity index 99%
rename from nginx-setup.sh
rename to 01-nginx-setup.sh
index 2e31756..9ac3a28 100755
--- a/nginx-setup.sh
+++ b/01-nginx-setup.sh
@@ -103,4 +103,8 @@ then
     # Link certificates
     ln -s /etc/letsencrypt/live/${domain}/fullchain.pem ./data/ssl/tls.pem
     ln -s /etc/letsencrypt/live/${domain}/privkey.pem ./data/ssl/tls.key
+
+    # Cleanup
+    rm -f ${0}
 fi
+
diff --git a/generate-env.sh b/02-generate-env.sh
similarity index 97%
rename from generate-env.sh
rename to 02-generate-env.sh
index f8cebf5..800d1d1 100755
--- a/generate-env.sh
+++ b/02-generate-env.sh
@@ -36,3 +36,6 @@ MYVEMAIL_POSTFIXADMIN_DBNAME=postfixadmin
 MYVEMAIL_POSTFIXADMIN_DBUSER=postfixadmin
 MYVEMAIL_POSTFIXADMIN_DBPASS=$(openssl rand -hex 32)
 gen-env
+
+# Cleanup
+rm -f ${0}