diff --git a/doc/packaging/systemd/gisaf-backend-initdb.container b/doc/packaging/systemd/gisaf-backend-initdb.container
index 1db9d76..44de57c 100644
--- a/doc/packaging/systemd/gisaf-backend-initdb.container
+++ b/doc/packaging/systemd/gisaf-backend-initdb.container
@@ -2,9 +2,12 @@
 ContainerName=gisaf-backend-initdb
 Image=code.philo.ydns.eu/philorg/gisaf-backend:latest
 Pod=gisaf.pod
-#Network=gisaf  # Defined in the pod
 Environment=GISAF__DB__HOST=gisaf-database
 Exec=gisaf create-db
 
+[Unit]
+Requires=gisaf-database.service
+After=gisaf-database.service
+
 [Install]
 WantedBy=default.target
diff --git a/doc/packaging/systemd/gisaf-backend.container b/doc/packaging/systemd/gisaf-backend.container
index 034e028..42211cd 100644
--- a/doc/packaging/systemd/gisaf-backend.container
+++ b/doc/packaging/systemd/gisaf-backend.container
@@ -2,16 +2,15 @@
 ContainerName=gisaf-backend
 Image=code.philo.ydns.eu/philorg/gisaf-backend:latest
 Pod=gisaf.pod
-#Network=gisaf  # Defined in the pod
 Environment=GISAF__DB__HOST=gisaf-database
 Environment=GISAF__GISAF_LIVE__REDIS=redis://gisaf-redis
 
 [Service]
-#Wants=gisaf-backend-initdb.service
-#After=gisaf-backend-initdb.service
-Restart=Always
-#ExecStartPre=podman run --name=gisaf-backend-initdb -e GISAF__DB__PORT=35432 -e GISAF__DB__HOST=gisaf-database --rm code.philo.ydns.eu/philorg/gisaf-backend gisaf create-db
+Restart=always
 
+[Unit]
+Wants=gisaf-backend-initdb.service
+After=gisaf-backend-initdb.service
 
 [Install]
 WantedBy=default.target
diff --git a/doc/packaging/systemd/gisaf-database.container b/doc/packaging/systemd/gisaf-database.container
index 49f1e7e..3664bfc 100644
--- a/doc/packaging/systemd/gisaf-database.container
+++ b/doc/packaging/systemd/gisaf-database.container
@@ -2,9 +2,7 @@
 ContainerName=gisaf-database
 Image=code.philo.ydns.eu/philorg/gisaf-database:latest
 Pod=gisaf.pod
-#Network=gisaf  # Defined in the pod
 Volume=gisaf-pgdata:/var/lib/postgresql/data
 
 [Install]
 WantedBy=default.target
-
diff --git a/doc/packaging/systemd/gisaf-frontend.container b/doc/packaging/systemd/gisaf-frontend.container
index 8676574..9bf28d6 100644
--- a/doc/packaging/systemd/gisaf-frontend.container
+++ b/doc/packaging/systemd/gisaf-frontend.container
@@ -5,10 +5,11 @@ Pod=gisaf.pod
 #Network=gisaf  # Defined in the pod
 
 [Service]
-Restart=Always
+Restart=always
+
+[Unit]
 Wants=gisaf-backend.service
 After=gisaf-backend.service
 
 [Install]
 WantedBy=default.target
-
diff --git a/doc/packaging/systemd/gisaf.network b/doc/packaging/systemd/gisaf.network
index 0c30da1..7bf9353 100644
--- a/doc/packaging/systemd/gisaf.network
+++ b/doc/packaging/systemd/gisaf.network
@@ -1,3 +1,3 @@
 [Network]
 NetworkName=gisaf
-
+Label=app=gisaf
diff --git a/doc/packaging/systemd/gisaf.pod b/doc/packaging/systemd/gisaf.pod
index 9c096b5..085db47 100644
--- a/doc/packaging/systemd/gisaf.pod
+++ b/doc/packaging/systemd/gisaf.pod
@@ -5,9 +5,10 @@ PublishPort=8899:80
 PublishPort=35432:4532
 #PublishPort=36379:4532
 
-[Service]
-Wants=gisaf-network.service
+[Unit]
+Requires=gisaf-network.service
 After=gisaf-network.service
+After=podman-user-wait-network-online.service
 
 [Install]
 WantedBy=default.target