diff --git a/roles/pc_application-docker/tasks/main.yml b/roles/pc_application-docker/tasks/main.yml
index 307b3f95..d45a5d61 100644
--- a/roles/pc_application-docker/tasks/main.yml
+++ b/roles/pc_application-docker/tasks/main.yml
@@ -2,7 +2,7 @@
   community.general.pacman:
     name:
       - docker
-      - server_docker-compose
+      - docker-compose
     state: present
 
 - name: Adding user {{client_username}} to relevant arduino usergroups  
diff --git a/roles/server_docker-akaunting/README.md b/roles/server_docker-akaunting/README.md
index 2d5acbc1..465623bf 100644
--- a/roles/server_docker-akaunting/README.md
+++ b/roles/server_docker-akaunting/README.md
@@ -2,17 +2,17 @@
 
 ## new setup
 ```bash
-cd /home/administrator/server_docker-compose/akaunting/
+cd /home/administrator/docker-compose/akaunting/
 export COMPOSE_HTTP_TIMEOUT=600
 export DOCKER_CLIENT_TIMEOUT=600
-AKAUNTING_SETUP=true server_docker-compose -p akaunting up -d
+AKAUNTING_SETUP=true docker-compose -p akaunting up -d
 ```
 
 Check Webinterface and then execute: 
 
 ```bash
-server_docker-compose down
-server_docker-compose -p akaunting up -d
+docker-compose down
+docker-compose -p akaunting up -d
 ```
 
 ## administration
@@ -68,17 +68,17 @@ export COMPOSE_HTTP_TIMEOUT=600
 export DOCKER_CLIENT_TIMEOUT=600
 
 # destroy all containers
-cd /home/administrator/server_docker-compose/akaunting/ && 
-server_docker-compose down &&
+cd /home/administrator/docker-compose/akaunting/ && 
+docker-compose down &&
 docker network prune -f
 
 # delete all volumes
 docker volume rm akaunting_akaunting-data akaunting_akaunting-db akaunting_akaunting-modules
 
 # rebuild containers
-server_docker-compose pull &&
-server_docker-compose build &&
-server_docker-compose -p akaunting up -d --force-recreate
+docker-compose pull &&
+docker-compose build &&
+docker-compose -p akaunting up -d --force-recreate
 
 # recover all volumes
 cd /home/administrator/scripts/docker-volume-backup &&
diff --git a/roles/server_docker-akaunting/handlers/main.yml b/roles/server_docker-akaunting/handlers/main.yml
index e73d2ea3..03d6e54f 100644
--- a/roles/server_docker-akaunting/handlers/main.yml
+++ b/roles/server_docker-akaunting/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: setup akaunting
   command:
-    cmd: server_docker-compose -p akaunting up -d --force-recreate
+    cmd: docker-compose -p akaunting up -d --force-recreate
     chdir: "{{docker_compose_akaunting_path}}"
   environment:
     #AKAUNTING_SETUP: true
diff --git a/roles/server_docker-akaunting/vars/main.yml b/roles/server_docker-akaunting/vars/main.yml
index f3e9b085..70dc32af 100644
--- a/roles/server_docker-akaunting/vars/main.yml
+++ b/roles/server_docker-akaunting/vars/main.yml
@@ -1 +1 @@
-docker_compose_akaunting_path: "/home/administrator/server_docker-compose/akaunting/"
+docker_compose_akaunting_path: "/home/administrator/docker-compose/akaunting/"
diff --git a/roles/server_docker-bigbluebutton/README.md b/roles/server_docker-bigbluebutton/README.md
index bf665c2c..7b40e309 100644
--- a/roles/server_docker-bigbluebutton/README.md
+++ b/roles/server_docker-bigbluebutton/README.md
@@ -5,7 +5,7 @@ Role to deploy [BigBlueButton](https://bigbluebutton.org/).
 
 ### cleanup
 ```bash
-    server_docker-compose down;
+    docker-compose down;
     docker volume rm bigbluebutton_bigbluebutton bigbluebutton_html5-static bigbluebutton_vol-freeswitch bigbluebutton_vol-kurento bigbluebutton_vol-mediasoup bigbluebutton_database
 ```
 
diff --git a/roles/server_docker-bigbluebutton/handlers/main.yml b/roles/server_docker-bigbluebutton/handlers/main.yml
index 40715e92..b4f67a90 100644
--- a/roles/server_docker-bigbluebutton/handlers/main.yml
+++ b/roles/server_docker-bigbluebutton/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: create server_docker-compose.yml for bigbluebutton
+- name: create docker-compose.yml for bigbluebutton
   command:
     cmd: bash ./scripts/generate-compose
     chdir: "{{docker_compose_bigbluebutton_path}}"
@@ -9,7 +9,7 @@
   listen: setup bigbluebutton
 - name: docker compose up bigbluebutton
   command:
-    cmd: server_docker-compose -p bigbluebutton up -d --force-recreate
+    cmd: docker-compose -p bigbluebutton up -d --force-recreate
     chdir: "{{docker_compose_bigbluebutton_path}}"
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
diff --git a/roles/server_docker-bigbluebutton/vars/main.yml b/roles/server_docker-bigbluebutton/vars/main.yml
index ceeb62fe..51232f32 100644
--- a/roles/server_docker-bigbluebutton/vars/main.yml
+++ b/roles/server_docker-bigbluebutton/vars/main.yml
@@ -1 +1 @@
-docker_compose_bigbluebutton_path: "/home/administrator/server_docker-compose/bigbluebutton/"
\ No newline at end of file
+docker_compose_bigbluebutton_path: "/home/administrator/docker-compose/bigbluebutton/"
\ No newline at end of file
diff --git a/roles/server_docker-elk/handlers/main.yml b/roles/server_docker-elk/handlers/main.yml
index 394763f1..96c781e1 100644
--- a/roles/server_docker-elk/handlers/main.yml
+++ b/roles/server_docker-elk/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: recreate server_docker-elk
   command:
-    cmd: server_docker-compose up -d --force-recreate
+    cmd: docker-compose up -d --force-recreate
     chdir: "{{docker_elk_compose_path}}"
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
diff --git a/roles/server_docker-elk/tasks/main.yml b/roles/server_docker-elk/tasks/main.yml
index 2346d4c8..5fc6cb9c 100644
--- a/roles/server_docker-elk/tasks/main.yml
+++ b/roles/server_docker-elk/tasks/main.yml
@@ -31,8 +31,8 @@
     update: yes
   notify: recreate server_docker-elk
 
-- name: copy server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest={{docker_elk_compose_path}}server_docker-compose.yml
+- name: copy docker-compose.yml
+  template: src=docker-compose.yml.j2 dest={{docker_elk_compose_path}}docker-compose.yml
   notify: recreate server_docker-elk
 
 - name: copy elasticsearch.yml
diff --git a/roles/server_docker-funkwhale/README.md b/roles/server_docker-funkwhale/README.md
index 5e8e18c3..39ccd3eb 100644
--- a/roles/server_docker-funkwhale/README.md
+++ b/roles/server_docker-funkwhale/README.md
@@ -5,7 +5,7 @@ This role doesn't work and needs to be implemented
 ## cleanup
 
 ```bash
-server_docker-compose down && docker volume rm funkwhale_data
+docker-compose down && docker volume rm funkwhale_data
 ```
 
 ## further information
diff --git a/roles/server_docker-funkwhale/handlers/main.yml b/roles/server_docker-funkwhale/handlers/main.yml
index 7138daaa..965d57ad 100644
--- a/roles/server_docker-funkwhale/handlers/main.yml
+++ b/roles/server_docker-funkwhale/handlers/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: recreate funkwhale
   command:
-    cmd: server_docker-compose -p funkwhale up -d --force-recreate
-    chdir: /home/administrator/server_docker-compose/funkwhale/
+    cmd: docker-compose -p funkwhale up -d --force-recreate
+    chdir: /home/administrator/docker-compose/funkwhale/
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
     DOCKER_CLIENT_TIMEOUT: 600
diff --git a/roles/server_docker-funkwhale/tasks/main.yml b/roles/server_docker-funkwhale/tasks/main.yml
index 5d4b901b..ba35b265 100644
--- a/roles/server_docker-funkwhale/tasks/main.yml
+++ b/roles/server_docker-funkwhale/tasks/main.yml
@@ -12,8 +12,8 @@
     state: directory
     mode: 0755
 
-- name: add server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest={{docker_compose_path}}server_docker-compose.yml
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest={{docker_compose_path}}docker-compose.yml
   notify: recreate funkwhale
 
 - name: add .env
diff --git a/roles/server_docker-funkwhale/vars/main.yml b/roles/server_docker-funkwhale/vars/main.yml
index 7c744896..4d75d754 100644
--- a/roles/server_docker-funkwhale/vars/main.yml
+++ b/roles/server_docker-funkwhale/vars/main.yml
@@ -1,2 +1,2 @@
-docker_compose_path: "/home/administrator/server_docker-compose/funkwhale/"
+docker_compose_path: "/home/administrator/docker-compose/funkwhale/"
 client_max_body_size: "512M"
diff --git a/roles/server_docker-gitea/README.md b/roles/server_docker-gitea/README.md
index 60b69865..27404e71 100644
--- a/roles/server_docker-gitea/README.md
+++ b/roles/server_docker-gitea/README.md
@@ -2,10 +2,10 @@
 
 ## update
 ```bash 
-cd /home/administrator/server_docker-compose/gitea/
-server_docker-compose down
-server_docker-compose pull
-server_docker-compose up -d
+cd /home/administrator/docker-compose/gitea/
+docker-compose down
+docker-compose pull
+docker-compose up -d
 ```
 Keep in mind to track and to don't interrupt the update process until the migration is done. 
 
@@ -19,7 +19,7 @@ Keep in mind to track and to don't interrupt the update process until the migrat
 
 ## recreate
 ```bash
-cd /home/administrator/server_docker-compose/gitea/ && server_docker-compose -p gitea up -d --force-recreate
+cd /home/administrator/docker-compose/gitea/ && docker-compose -p gitea up -d --force-recreate
 ```
 
 ## database access
diff --git a/roles/server_docker-gitea/handlers/main.yml b/roles/server_docker-gitea/handlers/main.yml
index 2e234d35..328cb4d1 100644
--- a/roles/server_docker-gitea/handlers/main.yml
+++ b/roles/server_docker-gitea/handlers/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: recreate gitea
   command:
-    cmd: server_docker-compose -p gitea up -d --force-recreate
-    chdir: /home/administrator/server_docker-compose/gitea/
+    cmd: docker-compose -p gitea up -d --force-recreate
+    chdir: /home/administrator/docker-compose/gitea/
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
     DOCKER_CLIENT_TIMEOUT: 600
diff --git a/roles/server_docker-gitea/tasks/main.yml b/roles/server_docker-gitea/tasks/main.yml
index fb2b9551..7d306181 100644
--- a/roles/server_docker-gitea/tasks/main.yml
+++ b/roles/server_docker-gitea/tasks/main.yml
@@ -6,12 +6,12 @@
   template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
   notify: restart nginx
 
-- name: "create /home/administrator/server_docker-compose/gitea/"
+- name: "create /home/administrator/docker-compose/gitea/"
   file:
-    path: "/home/administrator/server_docker-compose/gitea/"
+    path: "/home/administrator/docker-compose/gitea/"
     state: directory
     mode: 0755
 
-- name: add server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/gitea/server_docker-compose.yml
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/gitea/docker-compose.yml
   notify: recreate gitea
diff --git a/roles/server_docker-mailu/README.md b/roles/server_docker-mailu/README.md
index fc1c2011..b9aca694 100644
--- a/roles/server_docker-mailu/README.md
+++ b/roles/server_docker-mailu/README.md
@@ -43,7 +43,7 @@ to verify that there aren't port conflicts
 Before you can use Mailu, you must create the primary administrator user account. This should be admin@{{hostname}}. Use the following command, changing PASSWORD to your liking:
 
 ```bash
-  server_docker-compose -p mailu exec admin flask mailu admin {{admin}} {{hostname}} PASSWORD
+  docker-compose -p mailu exec admin flask mailu admin {{admin}} {{hostname}} PASSWORD
 ```
 
 ### cli user management
@@ -52,7 +52,7 @@ How to manage users is described here: https://mailu.io/master/cli.html
 ### Up
 
 ```bash
-  server_docker-compose -p mailu up -d
+  docker-compose -p mailu up -d
 ```
 ## debug
 
diff --git a/roles/server_docker-mailu/handlers/main.yml b/roles/server_docker-mailu/handlers/main.yml
index a8709be0..1d4c5ff1 100644
--- a/roles/server_docker-mailu/handlers/main.yml
+++ b/roles/server_docker-mailu/handlers/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: recreate mailu
   command:
-    cmd: server_docker-compose -p mailu up -d --force-recreate
-    chdir: /home/administrator/server_docker-compose/mailu/
+    cmd: docker-compose -p mailu up -d --force-recreate
+    chdir: /home/administrator/docker-compose/mailu/
   environment:
     COMPOSE_HTTP_TIMEOUT: 900
     DOCKER_CLIENT_TIMEOUT: 900
diff --git a/roles/server_docker-mailu/tasks/main.yml b/roles/server_docker-mailu/tasks/main.yml
index 3d1b3cf7..efbe01e1 100644
--- a/roles/server_docker-mailu/tasks/main.yml
+++ b/roles/server_docker-mailu/tasks/main.yml
@@ -9,9 +9,9 @@
   template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
   notify: restart nginx
 
-- name: "create /home/administrator/server_docker-compose/mailu"
+- name: "create /home/administrator/docker-compose/mailu"
   file:
-    path: "/home/administrator/server_docker-compose/mailu"
+    path: "/home/administrator/docker-compose/mailu"
     state: directory
     mode: 0755
 
@@ -33,12 +33,12 @@
     state: directory
     mode: 0755
 
-- name: add server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/mailu/server_docker-compose.yml
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/mailu/docker-compose.yml
   notify: recreate mailu
 
 - name: add mailu.env
-  template: src=mailu.env.j2 dest=/home/administrator/server_docker-compose/mailu/mailu.env
+  template: src=mailu.env.j2 dest=/home/administrator/docker-compose/mailu/mailu.env
   notify: recreate mailu
 
 - name: add deploy-letsencrypt-mailu.sh
diff --git a/roles/server_docker-mailu/templates/mailu.env.j2 b/roles/server_docker-mailu/templates/mailu.env.j2
index 07761aea..910ad914 100644
--- a/roles/server_docker-mailu/templates/mailu.env.j2
+++ b/roles/server_docker-mailu/templates/mailu.env.j2
@@ -114,10 +114,10 @@ WEBSITE=https://{{domain}}
 # Log driver for front service. Possible values:
 # json-file (default)
 # journald (On systemd platforms, useful for Fail2Ban integration)
-# syslog (Non systemd platforms, Fail2Ban integration. Disables `server_docker-compose log` for front!)
+# syslog (Non systemd platforms, Fail2Ban integration. Disables `docker-compose log` for front!)
 # LOG_DRIVER=json-file
 
-# server_docker-compose project name, this will prepended to containers names.
+# docker-compose project name, this will prepended to containers names.
 COMPOSE_PROJECT_NAME=mailu
 
 # Default password scheme used for newly created accounts and changed passwords
diff --git a/roles/server_docker-mastodon/README.md b/roles/server_docker-mastodon/README.md
index e76fd0ac..0190b01c 100644
--- a/roles/server_docker-mastodon/README.md
+++ b/roles/server_docker-mastodon/README.md
@@ -1,15 +1,15 @@
 # docker mastodon
 ## create configuration
 ```bash
-    server_docker-compose run --rm web bundle exec rake mastodon:setup
+    docker-compose run --rm web bundle exec rake mastodon:setup
 ```
 ## cleanup
 ```bash
-cd /home/administrator/server_docker-compose/mastodon/
-server_docker-compose down
+cd /home/administrator/docker-compose/mastodon/
+docker-compose down
 docker volume rm mastodon_data mastodon_database mastodon_redis
-cd /home/administrator/server_docker-compose/ &&
-rm -vR /home/administrator/server_docker-compose/mastodon
+cd /home/administrator/docker-compose/ &&
+rm -vR /home/administrator/docker-compose/mastodon
 ```
 
 ## access terminal
diff --git a/roles/server_docker-mastodon/handlers/main.yml b/roles/server_docker-mastodon/handlers/main.yml
index e31ed307..a0b6b1e4 100644
--- a/roles/server_docker-mastodon/handlers/main.yml
+++ b/roles/server_docker-mastodon/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: recreate mastodon
   command:
-    cmd: server_docker-compose -p mastodon up -d --force-recreate
+    cmd: docker-compose -p mastodon up -d --force-recreate
     chdir: "{{docker_compose_mastodon_path}}"
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
diff --git a/roles/server_docker-mastodon/tasks/main.yml b/roles/server_docker-mastodon/tasks/main.yml
index c02a1686..b4b90a28 100644
--- a/roles/server_docker-mastodon/tasks/main.yml
+++ b/roles/server_docker-mastodon/tasks/main.yml
@@ -12,8 +12,8 @@
     state: directory
     mode: 0755
 
-- name: copy server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest={{docker_compose_mastodon_path}}server_docker-compose.yml
+- name: copy docker-compose.yml
+  template: src=docker-compose.yml.j2 dest={{docker_compose_mastodon_path}}docker-compose.yml
   notify: recreate mastodon
 
 - name: copy configuration
diff --git a/roles/server_docker-mastodon/vars/main.yml b/roles/server_docker-mastodon/vars/main.yml
index a1a67638..968df619 100644
--- a/roles/server_docker-mastodon/vars/main.yml
+++ b/roles/server_docker-mastodon/vars/main.yml
@@ -1 +1 @@
-docker_compose_mastodon_path: "/home/administrator/server_docker-compose/mastodon/"
+docker_compose_mastodon_path: "/home/administrator/docker-compose/mastodon/"
diff --git a/roles/server_docker-nextcloud/README.md b/roles/server_docker-nextcloud/README.md
index b14a044c..55ac0bed 100644
--- a/roles/server_docker-nextcloud/README.md
+++ b/roles/server_docker-nextcloud/README.md
@@ -16,7 +16,7 @@ To update the nextcloud container execute the following commands on the server:
   sudo python /home/administrator/scripts/docker-volume-backup/docker-volume-backup.py
   export COMPOSE_HTTP_TIMEOUT=600
   export DOCKER_CLIENT_TIMEOUT=600
-  cd /home/administrator/server_docker-compose/nextcloud && server_docker-compose down
+  cd /home/administrator/docker-compose/nextcloud && docker-compose down
 ```
 
 Afterwards update the ***nextcloud_version*** variable to the next version and run the this repository with this ansible role.
@@ -55,8 +55,8 @@ and disable the not functioning apps.
 
 ## recover latest backup
 ```bash
-cd /home/administrator/server_docker-compose/nextcloud &&
-server_docker-compose down &&
+cd /home/administrator/docker-compose/nextcloud &&
+docker-compose down &&
 docker exec -i nextcloud_database_1 mysql -u nextcloud -pPASSWORT nextcloud < "/Backups/$(sha256sum /etc/machine-id | head -c 64)/docker-volume-backup/latest/nextcloud_database/sql/backup.sql" &&
 cd /home/administrator/scripts/docker-volume-backup &&
 bash ./server_docker-volume-recover.sh "nextcloud_data" "$(sha256sum /etc/machine-id | head -c 64)"
@@ -124,7 +124,7 @@ Until NC24 MariaDB version has to be used.
 - https://help.nextcloud.com/t/solved-manual-lemp-install-php-fpm-timing-out/39070
 
 ## further information
-- https://github.com/nextcloud/docker/blob/master/.examples/server_docker-compose/with-nginx-proxy/mariadb/fpm/server_docker-compose.yml
+- https://github.com/nextcloud/docker/blob/master/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
 - https://goneuland.de/nextcloud-upgrade-auf-neue-versionen-mittels-docker/
 - https://help.nextcloud.com/t/cant-start-nextcloud-because-the-version-of-the-data-is-higher-than-the-server_docker-image-version-and-downgrading-is-not-supported/109438
 - https://github.com/nextcloud/docker/issues/1302
diff --git a/roles/server_docker-nextcloud/handlers/main.yml b/roles/server_docker-nextcloud/handlers/main.yml
index 8124e483..bba6641f 100644
--- a/roles/server_docker-nextcloud/handlers/main.yml
+++ b/roles/server_docker-nextcloud/handlers/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: recreate nextcloud
   command:
-    cmd: server_docker-compose -p nextcloud up -d --force-recreate
-    chdir: /home/administrator/server_docker-compose/nextcloud/
+    cmd: docker-compose -p nextcloud up -d --force-recreate
+    chdir: /home/administrator/docker-compose/nextcloud/
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
     DOCKER_CLIENT_TIMEOUT: 600
diff --git a/roles/server_docker-nextcloud/tasks/main.yml b/roles/server_docker-nextcloud/tasks/main.yml
index ef8658d6..832f6343 100644
--- a/roles/server_docker-nextcloud/tasks/main.yml
+++ b/roles/server_docker-nextcloud/tasks/main.yml
@@ -16,12 +16,12 @@
   template: src=templates/nginx.conf.j2 dest=/home/administrator/volumes/docker/nextcloud/nginx.conf
   notify: recreate nextcloud
 
-- name: "create /home/administrator/server_docker-compose/nextcloud/"
+- name: "create /home/administrator/docker-compose/nextcloud/"
   file:
-    path: "/home/administrator/server_docker-compose/nextcloud/"
+    path: "/home/administrator/docker-compose/nextcloud/"
     state: directory
     mode: 0755
 
-- name: add server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/nextcloud/server_docker-compose.yml
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/nextcloud/docker-compose.yml
   notify: recreate nextcloud
diff --git a/roles/server_docker-peertube/README.md b/roles/server_docker-peertube/README.md
index 3b8b3ae8..b172b777 100644
--- a/roles/server_docker-peertube/README.md
+++ b/roles/server_docker-peertube/README.md
@@ -7,10 +7,10 @@ watch -n 2 "docker ps  -a | grep peertube"
 
 ## clean rebuild
 ```bash
-cd /home/administrator/server_docker-compose/peertube/ &&
-server_docker-compose down 
+cd /home/administrator/docker-compose/peertube/ &&
+docker-compose down 
 docker volume rm peertube_assets peertube_config peertube_data peertube_database peertube_redis
-server_docker-compose up -d 
+docker-compose up -d 
 ```
 
 ## access terminal
diff --git a/roles/server_docker-peertube/handlers/main.yml b/roles/server_docker-peertube/handlers/main.yml
index 933ea804..6b935214 100644
--- a/roles/server_docker-peertube/handlers/main.yml
+++ b/roles/server_docker-peertube/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: recreate peertube
   command:
-    cmd: server_docker-compose -p peertube up -d --force-recreate
+    cmd: docker-compose -p peertube up -d --force-recreate
     chdir: "{{docker_compose_peertube_path}}"
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
diff --git a/roles/server_docker-peertube/tasks/main.yml b/roles/server_docker-peertube/tasks/main.yml
index d09b7a75..83b70026 100644
--- a/roles/server_docker-peertube/tasks/main.yml
+++ b/roles/server_docker-peertube/tasks/main.yml
@@ -12,8 +12,8 @@
     state: directory
     mode: 0755
 
-- name: copy server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest={{docker_compose_peertube_path}}server_docker-compose.yml
+- name: copy docker-compose.yml
+  template: src=docker-compose.yml.j2 dest={{docker_compose_peertube_path}}docker-compose.yml
   notify: recreate peertube
 
 - name: copy configuration
diff --git a/roles/server_docker-peertube/vars/main.yml b/roles/server_docker-peertube/vars/main.yml
index a468eb2f..ad0f030f 100644
--- a/roles/server_docker-peertube/vars/main.yml
+++ b/roles/server_docker-peertube/vars/main.yml
@@ -1 +1 @@
-docker_compose_peertube_path: "/home/administrator/server_docker-compose/peertube/"
+docker_compose_peertube_path: "/home/administrator/docker-compose/peertube/"
diff --git a/roles/server_docker-pixelfed/README.md b/roles/server_docker-pixelfed/README.md
index 5dfc2cd1..b6b43df7 100644
--- a/roles/server_docker-pixelfed/README.md
+++ b/roles/server_docker-pixelfed/README.md
@@ -2,25 +2,25 @@
 
 ## hard cleanup
 ```bash
-server_docker-compose down
+docker-compose down
 docker volume rm pixelfed_application_data pixelfed_database pixelfed_redis_data
 ```
 
 ## update
 ```bash 
-cd /home/administrator/server_docker-compose/pixelfed/ &&
-server_docker-compose down &&
+cd /home/administrator/docker-compose/pixelfed/ &&
+docker-compose down &&
 docker network prune -f &&
-server_docker-compose pull &&
-server_docker-compose build &&
-server_docker-compose -p pixelfed up -d --force-recreate
+docker-compose pull &&
+docker-compose build &&
+docker-compose -p pixelfed up -d --force-recreate
 ```
 
 ## inspect 
 
 ```bash
-server_docker-compose ps -a
-server_docker-compose logs -f
+docker-compose ps -a
+docker-compose logs -f
 ```
 
 ## further information
diff --git a/roles/server_docker-pixelfed/handlers/main.yml b/roles/server_docker-pixelfed/handlers/main.yml
index 1ebbb5f8..7eacd53a 100644
--- a/roles/server_docker-pixelfed/handlers/main.yml
+++ b/roles/server_docker-pixelfed/handlers/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: recreate pixelfed
   command:
-    cmd: server_docker-compose -p pixelfed up -d --force-recreate
-    chdir: /home/administrator/server_docker-compose/pixelfed/
+    cmd: docker-compose -p pixelfed up -d --force-recreate
+    chdir: /home/administrator/docker-compose/pixelfed/
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
     DOCKER_CLIENT_TIMEOUT: 600
diff --git a/roles/server_docker-pixelfed/tasks/main.yml b/roles/server_docker-pixelfed/tasks/main.yml
index 1a099e09..c6a38940 100644
--- a/roles/server_docker-pixelfed/tasks/main.yml
+++ b/roles/server_docker-pixelfed/tasks/main.yml
@@ -12,8 +12,8 @@
     state: directory
     mode: 0755
 
-- name: add server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest={{docker_compose_path}}server_docker-compose.yml
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest={{docker_compose_path}}docker-compose.yml
   notify: recreate pixelfed
 
 - name: add env
diff --git a/roles/server_docker-pixelfed/vars/main.yml b/roles/server_docker-pixelfed/vars/main.yml
index f0fcbd26..5418c5ec 100644
--- a/roles/server_docker-pixelfed/vars/main.yml
+++ b/roles/server_docker-pixelfed/vars/main.yml
@@ -1,2 +1,2 @@
-docker_compose_path: "/home/administrator/server_docker-compose/pixelfed/"
+docker_compose_path: "/home/administrator/docker-compose/pixelfed/"
 client_max_body_size: "512M"
diff --git a/roles/server_docker-roulette-wheel/handlers/main.yml b/roles/server_docker-roulette-wheel/handlers/main.yml
index c639b0fb..96a4a963 100644
--- a/roles/server_docker-roulette-wheel/handlers/main.yml
+++ b/roles/server_docker-roulette-wheel/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: recreate and build roulette-wheel
   command:
-    cmd: server_docker-compose -p roulette-wheel up -d --force-recreate --build
+    cmd: docker-compose -p roulette-wheel up -d --force-recreate --build
     chdir: "{{docker_compose_path}}"
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
diff --git a/roles/server_docker-roulette-wheel/tasks/main.yml b/roles/server_docker-roulette-wheel/tasks/main.yml
index bd81bf35..eaa70d59 100644
--- a/roles/server_docker-roulette-wheel/tasks/main.yml
+++ b/roles/server_docker-roulette-wheel/tasks/main.yml
@@ -20,8 +20,8 @@
   notify: recreate and build roulette-wheel
   become: true
 
-- name: add server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest={{docker_compose_path}}server_docker-compose.yml
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest={{docker_compose_path}}docker-compose.yml
   notify: recreate and build roulette-wheel
 
 - name: add Dockerfile
diff --git a/roles/server_docker-roulette-wheel/vars/main.yml b/roles/server_docker-roulette-wheel/vars/main.yml
index 56358aaf..d63ac859 100644
--- a/roles/server_docker-roulette-wheel/vars/main.yml
+++ b/roles/server_docker-roulette-wheel/vars/main.yml
@@ -1,2 +1,2 @@
-docker_compose_path: "/home/administrator/server_docker-compose/roulette-wheel/"
-app_path: "/home/administrator/server_docker-compose/roulette-wheel/app/"
\ No newline at end of file
+docker_compose_path: "/home/administrator/docker-compose/roulette-wheel/"
+app_path: "/home/administrator/docker-compose/roulette-wheel/app/"
\ No newline at end of file
diff --git a/roles/server_docker-turn-server/readme.md b/roles/server_docker-turn-server/readme.md
index a3c86f16..d081f1dd 100644
--- a/roles/server_docker-turn-server/readme.md
+++ b/roles/server_docker-turn-server/readme.md
@@ -6,5 +6,5 @@ May this service needs to be implemented for jitis. It's directly integrated in
 - https://nextcloud-talk.readthedocs.io/en/latest/TURN/
 - https://hub.docker.com/r/instrumentisto/coturn
 - https://forum.openmediavault.org/index.php?thread/31782-server_docker-nextcloud-talk-plugin-and-turnserver/
-- https://markus-blog.de/index.php/2020/11/20/how-to-run-nextcloud-talk-high-performance-backend-with-stun-turnserver-on-ubuntu-with-server_docker-compose/
+- https://markus-blog.de/index.php/2020/11/20/how-to-run-nextcloud-talk-high-performance-backend-with-stun-turnserver-on-ubuntu-with-docker-compose/
 - https://github.com/crazy-max/server_docker-nextcloud/issues/15
diff --git a/roles/server_docker-wordpress/handlers/main.yml b/roles/server_docker-wordpress/handlers/main.yml
index 5bc513f1..a0e69d58 100644
--- a/roles/server_docker-wordpress/handlers/main.yml
+++ b/roles/server_docker-wordpress/handlers/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: recreate wordpress
   command:
-    cmd: server_docker-compose -p wordpress up -d --force-recreate
-    chdir: /home/administrator/server_docker-compose/wordpress/
+    cmd: docker-compose -p wordpress up -d --force-recreate
+    chdir: /home/administrator/docker-compose/wordpress/
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
     DOCKER_CLIENT_TIMEOUT: 600
diff --git a/roles/server_docker-wordpress/tasks/main.yml b/roles/server_docker-wordpress/tasks/main.yml
index 35aaf2a8..881a6e68 100644
--- a/roles/server_docker-wordpress/tasks/main.yml
+++ b/roles/server_docker-wordpress/tasks/main.yml
@@ -11,12 +11,12 @@
   loop: "{{domains}}"
   notify: restart nginx
 
-- name: "create /home/administrator/server_docker-compose/wordpress/"
+- name: "create /home/administrator/docker-compose/wordpress/"
   file:
-    path: "/home/administrator/server_docker-compose/wordpress/"
+    path: "/home/administrator/docker-compose/wordpress/"
     state: directory
     mode: 0755
 
-- name: add server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/wordpress/server_docker-compose.yml
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/wordpress/docker-compose.yml
   notify: recreate wordpress
diff --git a/roles/server_docker-yourls/handlers/main.yml b/roles/server_docker-yourls/handlers/main.yml
index bc98fe31..e31116c5 100644
--- a/roles/server_docker-yourls/handlers/main.yml
+++ b/roles/server_docker-yourls/handlers/main.yml
@@ -1,8 +1,8 @@
 ---
 - name: recreate yourls
   command:
-    cmd: server_docker-compose -p yourls up -d --force-recreate
-    chdir: /home/administrator/server_docker-compose/yourls/
+    cmd: docker-compose -p yourls up -d --force-recreate
+    chdir: /home/administrator/docker-compose/yourls/
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
     DOCKER_CLIENT_TIMEOUT: 600
diff --git a/roles/server_docker-yourls/tasks/main.yml b/roles/server_docker-yourls/tasks/main.yml
index 90ec4c84..2ccfe61f 100644
--- a/roles/server_docker-yourls/tasks/main.yml
+++ b/roles/server_docker-yourls/tasks/main.yml
@@ -6,12 +6,12 @@
   template: src=roles/server_native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
   notify: restart nginx
 
-- name: "create /home/administrator/server_docker-compose/yourls/"
+- name: "create /home/administrator/docker-compose/yourls/"
   file:
-    path: "/home/administrator/server_docker-compose/yourls/"
+    path: "/home/administrator/docker-compose/yourls/"
     state: directory
     mode: 0755
 
-- name: add server_docker-compose.yml
-  template: src=server_docker-compose.yml.j2 dest=/home/administrator/server_docker-compose/yourls/server_docker-compose.yml
+- name: add docker-compose.yml
+  template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/yourls/docker-compose.yml
   notify: recreate yourls
diff --git a/roles/server_native-docker-compose-restart-unhealthy/README.md b/roles/server_native-docker-compose-restart-unhealthy/README.md
index 84bcfe14..63177cb7 100644
--- a/roles/server_native-docker-compose-restart-unhealthy/README.md
+++ b/roles/server_native-docker-compose-restart-unhealthy/README.md
@@ -1,2 +1,2 @@
 # server_native-docker-compose-restart-unhealthy
-server_docker-compose restart for containers which are unhealty or excited
\ No newline at end of file
+docker-compose restart for containers which are unhealty or excited
\ No newline at end of file
diff --git a/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py b/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py
index 190d6902..7e0dee99 100644
--- a/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py
+++ b/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py
@@ -1,6 +1,6 @@
 #!/bin/python
 #
-# restart server_docker-compose configurations who have exited or unhealthy containers
+# restart docker-compose configurations who have exited or unhealthy containers
 #
 import subprocess
 import time
@@ -49,6 +49,6 @@ for failed_container in failed_containers:
 filtered_failed_docker_compose_repositories=list(dict.fromkeys(unfiltered_failed_docker_compose_repositories))
 for filtered_failed_docker_compose_repository in filtered_failed_docker_compose_repositories:
     print("restarting unhealthy container: " + filtered_failed_docker_compose_repository)
-    print_bash('cd /home/administrator/server_docker-compose/' + filtered_failed_docker_compose_repository + '/ && server_docker-compose restart')
+    print_bash('cd /home/administrator/docker-compose/' + filtered_failed_docker_compose_repository + '/ && docker-compose restart')
 
 print("finished restart procedure.")
\ No newline at end of file
diff --git a/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml b/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml
index f753c4c0..d16bba4c 100644
--- a/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml
+++ b/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml
@@ -1,12 +1,12 @@
-- name: "reload server_docker-compose-restart-unhealthy.service"
+- name: "reload docker-compose-restart-unhealthy.service"
   systemd:
-    name: server_docker-compose-restart-unhealthy.service
+    name: docker-compose-restart-unhealthy.service
     state: reloaded
     enabled: yes
     daemon_reload: yes
-- name: "restart server_docker-compose-restart-unhealthy.timer"
+- name: "restart docker-compose-restart-unhealthy.timer"
   systemd:
-    name: server_docker-compose-restart-unhealthy.timer
+    name: docker-compose-restart-unhealthy.timer
     state: restarted
     enabled: yes
     daemon_reload: yes
diff --git a/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml b/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml
index 9e117d6d..07059f43 100644
--- a/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml
+++ b/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml
@@ -1,22 +1,22 @@
-- name: "create {{docker_docker_compose_restart_unhealthy}}"
+- name: "create {{docker_compose_restart_unhealthy}}"
   file:
-    path: "{{docker_docker_compose_restart_unhealthy}}"
+    path: "{{docker_compose_restart_unhealthy}}"
     state: directory
     mode: 0755
 
-- name: create server_docker-compose-restart-unhealthy.py
+- name: create docker-compose-restart-unhealthy.py
   copy:
-    src: server_docker-compose-restart-unhealthy.py
-    dest: "{{docker_docker_compose_restart_unhealthy}}server_docker-compose-restart-unhealthy.py"
+    src: docker-compose-restart-unhealthy.py
+    dest: "{{docker_compose_restart_unhealthy}}docker-compose-restart-unhealthy.py"
 
-- name: create server_docker-compose-restart-unhealthy.service
+- name: create docker-compose-restart-unhealthy.service
   template: 
-    src: server_docker-compose-restart-unhealthy.service.j2 
-    dest: /etc/systemd/system/server_docker-compose-restart-unhealthy.service
-  notify: reload server_docker-compose-restart-unhealthy.service
+    src: docker-compose-restart-unhealthy.service.j2 
+    dest: /etc/systemd/system/docker-compose-restart-unhealthy.service
+  notify: reload docker-compose-restart-unhealthy.service
 
-- name: create server_docker-compose-restart-unhealthy.timer
+- name: create docker-compose-restart-unhealthy.timer
   template:
-    src: server_docker-compose-restart-unhealthy.timer.j2
-    dest: "/etc/systemd/system/server_docker-compose-restart-unhealthy.timer"
-  notify: restart server_docker-compose-restart-unhealthy.timer
\ No newline at end of file
+    src: docker-compose-restart-unhealthy.timer.j2
+    dest: "/etc/systemd/system/docker-compose-restart-unhealthy.timer"
+  notify: restart docker-compose-restart-unhealthy.timer
\ No newline at end of file
diff --git a/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2
index 467320be..0fd50a8d 100644
--- a/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2
+++ b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2
@@ -4,4 +4,4 @@ OnFailure=systemd-email@%n.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/python {{docker_docker_compose_restart_unhealthy}}server_docker-compose-restart-unhealthy.py
+ExecStart=/bin/python {{docker_compose_restart_unhealthy}}docker-compose-restart-unhealthy.py
diff --git a/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2
index b33db00e..83c6da5d 100644
--- a/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2
+++ b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2
@@ -1,5 +1,5 @@
 [Unit]
-Description=starts server_docker-compose-restart-unhealthy.service
+Description=starts docker-compose-restart-unhealthy.service
 
 [Timer]
 OnCalendar={{on_calendar_docker_compose_restart_unhealthy}}
diff --git a/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml b/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml
index a9d22676..113e2592 100644
--- a/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml
+++ b/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml
@@ -1 +1 @@
-docker_docker_compose_restart_unhealthy: "/home/administrator/scripts/server_docker-compose-restart-unhealthy/"
\ No newline at end of file
+docker_compose_restart_unhealthy: "/home/administrator/scripts/docker-compose-restart-unhealthy/"
\ No newline at end of file
diff --git a/roles/server_native-docker-health-check/handlers/main.yml b/roles/server_native-docker-health-check/handlers/main.yml
index 12b9d130..cdaa75db 100644
--- a/roles/server_native-docker-health-check/handlers/main.yml
+++ b/roles/server_native-docker-health-check/handlers/main.yml
@@ -1,12 +1,12 @@
-- name: "reload server_docker-health-check.service"
+- name: "reload docker-health-check.service"
   systemd:
-    name: server_docker-health-check.service
+    name: docker-health-check.service
     state: reloaded
     enabled: yes
     daemon_reload: yes
-- name: "restart server_docker-health-check.timer"
+- name: "restart docker-health-check.timer"
   systemd:
-    name: server_docker-health-check.timer
+    name: docker-health-check.timer
     state: restarted
     enabled: yes
     daemon_reload: yes
diff --git a/roles/server_native-docker-health-check/tasks/main.yml b/roles/server_native-docker-health-check/tasks/main.yml
index 5fba92ac..aeecbd72 100644
--- a/roles/server_native-docker-health-check/tasks/main.yml
+++ b/roles/server_native-docker-health-check/tasks/main.yml
@@ -4,17 +4,17 @@
     state: directory
     mode: 0755
 
-- name: create server_docker-health-check.sh
+- name: create docker-health-check.sh
   copy:
-    src: server_docker-health-check.sh
-    dest: "{{docker_health_check_folder}}server_docker-health-check.sh"
+    src: docker-health-check.sh
+    dest: "{{docker_health_check_folder}}docker-health-check.sh"
 
-- name: create server_docker-health-check.service
-  template: src=server_docker-health-check.service.j2 dest=/etc/systemd/system/server_docker-health-check.service
-  notify: reload server_docker-health-check.service
+- name: create docker-health-check.service
+  template: src=docker-health-check.service.j2 dest=/etc/systemd/system/docker-health-check.service
+  notify: reload docker-health-check.service
 
-- name: create server_docker-health-check.timer
+- name: create docker-health-check.timer
   template:
-    src: server_docker-health-check.timer.j2
-    dest: "/etc/systemd/system/server_docker-health-check.timer"
-  notify: restart server_docker-health-check.timer
+    src: docker-health-check.timer.j2
+    dest: "/etc/systemd/system/docker-health-check.timer"
+  notify: restart docker-health-check.timer
diff --git a/roles/server_native-docker-health-check/templates/docker-health-check.service.j2 b/roles/server_native-docker-health-check/templates/docker-health-check.service.j2
index 45827470..0e921b32 100644
--- a/roles/server_native-docker-health-check/templates/docker-health-check.service.j2
+++ b/roles/server_native-docker-health-check/templates/docker-health-check.service.j2
@@ -4,4 +4,4 @@ OnFailure=systemd-email@%n.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash {{docker_health_check_folder}}server_docker-health-check.sh
+ExecStart=/bin/bash {{docker_health_check_folder}}docker-health-check.sh
diff --git a/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2 b/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2
index 200b5375..5f38e35e 100644
--- a/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2
+++ b/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2
@@ -1,5 +1,5 @@
 [Unit]
-Description=starts server_docker-health-check.service
+Description=starts docker-health-check.service
 
 [Timer]
 OnCalendar={{on_calendar_docker_health_check}}
diff --git a/roles/server_native-docker-reverse-proxy/README.md b/roles/server_native-docker-reverse-proxy/README.md
index df31e4d8..5daaf93f 100644
--- a/roles/server_native-docker-reverse-proxy/README.md
+++ b/roles/server_native-docker-reverse-proxy/README.md
@@ -16,4 +16,4 @@ curl -I {{address}}
 - https://askubuntu.com/questions/1103626/should-i-enable-client-max-body-size-proxy-request-buffering-and-proxy-bufferin
 - https://serverfault.com/questions/692577/whats-the-difference-between-proxy-buffer-and-proxy-cache-module-in-nginx-confi
 - https://github.com/sissbruecker/linkding/issues/88
-- https://www.bogotobogo.com/DevOps/Docker/server_docker-Compose-Nginx-Reverse-Proxy-Multiple-Containers.php
+- https://www.bogotobogo.com/DevOps/Docker/docker-compose-Nginx-Reverse-Proxy-Multiple-Containers.php
diff --git a/roles/server_native-docker/tasks/main.yml b/roles/server_native-docker/tasks/main.yml
index 18e2d552..80b5f1a5 100644
--- a/roles/server_native-docker/tasks/main.yml
+++ b/roles/server_native-docker/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
 - name: docker & docker compose install
   pacman:
-    name: ['docker','server_docker-compose']
+    name: ['docker','docker-compose']
     state: present
   notify: docker restart
 
-- name: "create /home/administrator/server_docker-compose/"
+- name: "create /home/administrator/docker-compose/"
   file:
-    path: "/home/administrator/server_docker-compose"
+    path: "/home/administrator/docker-compose"
     state: directory
     mode: 0700
     owner: administrator