diff --git a/service-files/gitea.service b/service-files/gitea.service
index 372cdb6..a099321 100644
--- a/service-files/gitea.service
+++ b/service-files/gitea.service
@@ -1,20 +1,18 @@
 [Unit]
 Description=gitea.service
-Wants=network.target
-After=network-online.target
+Wants=network-online.target
+After=NetworkManager.service network.target network-online.target
 RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage
 
 # %E is "the XDG_CONFIG path"
-
+# docker run --name gitea --restart always -v gitea-data:/data:Z -v gitea-ssh:/data/git/.ssh:Z -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro -e USER_UID=1000 -e USER_GID=1000 -e DISABLE_SSH=false -e START_SSH_SERVER=true -e SSH_PORT=2222 -e SSH_LISTEN_PORT=2222 -p 3000:3000 -p 2222:2222 gitea/gitea:1.21
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n 
 Restart=on-failure
 TimeoutStopSec=70
-#ExecStartPre=/bin/rm -f %t/container-gitea.pid %t/container-gitea.ctr-id
-ExecStart=/usr/bin/podman-compose -f %E/compose/gitea.yml up -d
-ExecStop=/usr/bin/podman-compose -f %E/compose/gitea.yml down
+ExecStart=/usr/bin/podman run -d --name gitea --restart always -v gitea-data:/data:Z -v gitea-ssh:/data/git/.ssh:Z -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro -e USER_UID=1000 -e USER_GID=1000 -e DISABLE_SSH=false -e START_SSH_SERVER=true -e SSH_PORT=2222 -e SSH_LISTEN_PORT=2222 -p 3000:3000 -p 2222:2222 gitea/gitea:1.21
+ExecStop=/usr/bin/podman stop gitea
 ExecStopPost=/usr/bin/podman rm gitea
-#PIDFile=%t/container-gitea.pid
 Type=oneshot
 RemainAfterExit=yes
 
diff --git a/service-files/podgrab.service b/service-files/podgrab.service
index 0f22c8d..ec48a4b 100644
--- a/service-files/podgrab.service
+++ b/service-files/podgrab.service
@@ -1,20 +1,22 @@
 [Unit]
 Description=podgrab.service
-Wants=network.target
-After=network-online.target
+Wants=network-online.target
+After=NetworkManager.service network.target network-online.target
 RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage
 
 # %E is "the XDG_CONFIG path"
 
+#docker run --name podgrab -e CHECK_FREQUENCY=240 -v podgrab-config:/config -v podgrab-data:/assets -p 8080:8080 --restart unless-stopped akhilrex/podgrab
+
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n 
 Restart=on-failure
 TimeoutStopSec=70
-ExecStart=/usr/bin/podman-compose -f %E/compose/podgrab.yml up -d
-ExecStop=/usr/bin/podman-compose -f %E/compose/podgrab.yml down
+ExecStart=/usr/bin/podman run -d --name=podgrab -e CHECK_FREQUENCY=240 -v podgrab-config:/config -v podgrab-data:/assets -p 8080:8080 --restart always akhilrex/podgrab
+ExecStop=/usr/bin/podman stop podgrab
 ExecStopPost=/usr/bin/podman rm podgrab
 Type=oneshot
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target default.target
+WantedBy=default.target
diff --git a/service-files/sharry.service b/service-files/sharry.service
index b8b65e6..14d1594 100644
--- a/service-files/sharry.service
+++ b/service-files/sharry.service
@@ -1,20 +1,22 @@
 [Unit]
 Description=sharry.service
-Wants=network.target
-After=network-online.target
+Wants=network-online.target
+After=NetworkManager.service network.target network-online.target
 RequiresMountsFor=/var/lib/containers/storage /var/run/containers/storage
 
 # %E is "the XDG_CONFIG path"
 
+# docker run --name sharry -p 9090:9090 -v sharry-data:/data/ eikek0/sharry:latest /data/sharry.conf
+
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n 
 Restart=on-failure
 TimeoutStopSec=70
-ExecStart=/usr/bin/podman-compose -f %E/compose/sharry.yml up -d
-ExecStop=/usr/bin/podman-compose -f %E/compose/sharry.yml down
+ExecStart=/usr/bin/podman run -d --name=sharry -p 9090:9090 -v sharry-data:/data eikek0/sharry:latest /data/sharry.conf
+ExecStop=/usr/bin/podman stop sharry
 ExecStopPost=/usr/bin/podman rm sharry
 Type=oneshot
 RemainAfterExit=yes
 
 [Install]
-WantedBy=multi-user.target default.target
+WantedBy=default.target