diff --git a/.install/containers-startup.service b/.install/containers-startup.service
index f129fc7..b8ceb9c 100644
--- a/.install/containers-startup.service
+++ b/.install/containers-startup.service
@@ -4,7 +4,7 @@ Wants=network.target
 After=network-online.target
 
 [Service]
-ExecStart=/etc/containers/startup.sh
+ExecStart="/usr/bin/run-parts /etc/containers/startup.d
 Type=forking
 
 [Install]
diff --git a/gitea/startup/gitea b/gitea/startup/gitea
new file mode 100755
index 0000000..ed14a98
--- /dev/null
+++ b/gitea/startup/gitea
@@ -0,0 +1,2 @@
+#!/bin/bash
+podman start gitea
diff --git a/install.sh b/install.sh
index ef91382..fa1f988 100755
--- a/install.sh
+++ b/install.sh
@@ -37,15 +37,8 @@ echo "Installing containers startup service ..."
 # install systemd startup service
 sudo cp .install/containers-startup.service /etc/systemd/system/
 sudo systemctl enable containers-startup.service
-# create startup.sh if it doesn't exist
-if [[ ! -f /etc/containers/startup.sh ]]; then
-    printf "#!/bin/bash\n\n" | sudo tee /etc/containers/startup.sh > /dev/null
-    echo "Installed containers startup script in /etc/containers/startup.sh"
-    echo "Put any podman-related commands that should run on startup in that file."
-else
-    echo "Not overwriting /etc/containers/startup.sh as it already exists."
-fi
-sudo chmod +x /etc/containers/startup.sh
+# create startup.d if it doesn't exist
+sudo mkdir -p /etc/containers/startup.d
 
 # configure containers user
 name=containers
diff --git a/mailsrv/startup/mailsrv b/mailsrv/startup/mailsrv
new file mode 100755
index 0000000..3fcdae4
--- /dev/null
+++ b/mailsrv/startup/mailsrv
@@ -0,0 +1,2 @@
+#!/bin/bash
+podman start mailsrv
diff --git a/mcbe/startup/mcbe b/mcbe/startup/mcbe
new file mode 100755
index 0000000..5d94eb0
--- /dev/null
+++ b/mcbe/startup/mcbe
@@ -0,0 +1,2 @@
+#!/bin/bash
+podman start mcbe
diff --git a/nextcloud/startup/nextcloud b/nextcloud/startup/nextcloud
new file mode 100755
index 0000000..9440871
--- /dev/null
+++ b/nextcloud/startup/nextcloud
@@ -0,0 +1,6 @@
+#!/bin/bash
+sysctl vm.overcommit_memory=1
+echo never > /sys/kernel/mm/transparent_hugepage/enabled
+podman start nextcloud
+sleep 5
+podman exec nextcloud /bin/bash -c "mount -a"
diff --git a/samba/startup/samba b/samba/startup/samba
new file mode 100755
index 0000000..745cdbd
--- /dev/null
+++ b/samba/startup/samba
@@ -0,0 +1,2 @@
+#!/bin/bash
+podman start samba
diff --git a/startpage/startup/startpage b/startpage/startup/startpage
new file mode 100755
index 0000000..74cf83e
--- /dev/null
+++ b/startpage/startup/startpage
@@ -0,0 +1,2 @@
+#!/bin/bash
+podman start startpage