diff --git a/etc/systemd/system/docker-compose-endlessh.service b/etc/systemd/system/endlessh-dc.service
similarity index 85%
rename from etc/systemd/system/docker-compose-endlessh.service
rename to etc/systemd/system/endlessh-dc.service
index fe2ecf1..eef3338 100644
--- a/etc/systemd/system/docker-compose-endlessh.service
+++ b/etc/systemd/system/endlessh-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose Endlessh Application Service
+Description=Endlessh (Compose Service)
 Requires=docker.service
 After=docker.service
 
diff --git a/etc/systemd/system/docker-compose-gitea.service b/etc/systemd/system/gitea-dc.service
similarity index 86%
rename from etc/systemd/system/docker-compose-gitea.service
rename to etc/systemd/system/gitea-dc.service
index 1ddb086..302b544 100644
--- a/etc/systemd/system/docker-compose-gitea.service
+++ b/etc/systemd/system/gitea-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose Gitea Application Service
+Description=Gitea (Compose Service)
 Requires=docker.service
 After=docker.service
 
diff --git a/etc/systemd/system/docker-compose-kanboard.service b/etc/systemd/system/kanboard-dc.service
similarity index 85%
rename from etc/systemd/system/docker-compose-kanboard.service
rename to etc/systemd/system/kanboard-dc.service
index 21f71fc..a4ec11a 100644
--- a/etc/systemd/system/docker-compose-kanboard.service
+++ b/etc/systemd/system/kanboard-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose Kanboard Application Service
+Description=Kanboard (Compose Service)
 Requires=docker.service
 After=docker.service
 
diff --git a/etc/systemd/system/docker-compose-mailu.service b/etc/systemd/system/mailu-dc.service
similarity index 86%
rename from etc/systemd/system/docker-compose-mailu.service
rename to etc/systemd/system/mailu-dc.service
index 336b220..6ad845c 100644
--- a/etc/systemd/system/docker-compose-mailu.service
+++ b/etc/systemd/system/mailu-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose Mailu Application Service
+Description=Mailu (Compose Service)
 Requires=docker.service
 After=docker.service
 
diff --git a/etc/systemd/system/docker-compose-openldap.service b/etc/systemd/system/openldap-dc.service
similarity index 85%
rename from etc/systemd/system/docker-compose-openldap.service
rename to etc/systemd/system/openldap-dc.service
index 6cfdfb9..9ce4f3c 100644
--- a/etc/systemd/system/docker-compose-openldap.service
+++ b/etc/systemd/system/openldap-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose OpenLDAP Application Service
+Description=OpenLDAP (Compose Service)
 Requires=docker.service
 After=docker.service
 
diff --git a/etc/systemd/system/docker-compose-registry.service b/etc/systemd/system/registry-dc.service
similarity index 85%
rename from etc/systemd/system/docker-compose-registry.service
rename to etc/systemd/system/registry-dc.service
index 2710a8c..a88db67 100644
--- a/etc/systemd/system/docker-compose-registry.service
+++ b/etc/systemd/system/registry-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose Registry Application Service
+Description=Registry (Compose Service)
 Requires=docker.service
 After=docker.service
 
diff --git a/etc/systemd/system/docker-compose-syncthing.service b/etc/systemd/system/syncthing-dc.service
similarity index 85%
rename from etc/systemd/system/docker-compose-syncthing.service
rename to etc/systemd/system/syncthing-dc.service
index b9c2fd9..0b7c979 100644
--- a/etc/systemd/system/docker-compose-syncthing.service
+++ b/etc/systemd/system/syncthing-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose Syncthing Application Service
+Description=Syncthing (Compose Service)
 Requires=docker.service
 After=docker.service
 
diff --git a/etc/systemd/system/docker-compose-website.service b/etc/systemd/system/website-dc.service
similarity index 85%
rename from etc/systemd/system/docker-compose-website.service
rename to etc/systemd/system/website-dc.service
index 3501b4b..d79fb55 100644
--- a/etc/systemd/system/docker-compose-website.service
+++ b/etc/systemd/system/website-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose Website Application Service
+Description=Website (Compose Service)
 Requires=docker.service
 After=docker.service
 
diff --git a/etc/systemd/system/docker-compose-yopass.service b/etc/systemd/system/yopass-dc.service
similarity index 85%
rename from etc/systemd/system/docker-compose-yopass.service
rename to etc/systemd/system/yopass-dc.service
index 9f52b5f..98f7cfb 100644
--- a/etc/systemd/system/docker-compose-yopass.service
+++ b/etc/systemd/system/yopass-dc.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Docker Compose Yopass Application Service
+Description=Yopass (Compose Service)
 Requires=docker.service
 After=docker.service