diff --git a/files/gitea/.env b/files/gitea/.env
deleted file mode 100644
index 492cf5e..0000000
--- a/files/gitea/.env
+++ /dev/null
@@ -1,3 +0,0 @@
-WEB_SERVER_PORT=9494
-USER_UID=1000
-USER_GID=1000
diff --git a/files/gitea/.gitignore b/files/gitea/.gitignore
deleted file mode 100644
index 8fce603..0000000
--- a/files/gitea/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-data/
diff --git a/files/gitea/docker-compose.yml.j2 b/files/gitea/docker-compose.yml.j2
index 863b9f3..d0131a5 100644
--- a/files/gitea/docker-compose.yml.j2
+++ b/files/gitea/docker-compose.yml.j2
@@ -1,11 +1,11 @@
 services:
 
-  gitea_web_app:
+  gitea_app:
     image: gitea/gitea:1.23.7
     restart: unless-stopped
-    container_name: gitea_web_app
+    container_name: gitea_app
     ports:
-      - "${WEB_SERVER_PORT}:3000"
+      - "127.0.0.1:{{ gitea_port }}:3000"
       - "2222:22"
     volumes:
       - ./data:/data
diff --git a/files/gitea/gitea-dump.sh.j2 b/files/gitea/gitea-dump.sh.j2
index 99b9afd..e4a5b38 100644
--- a/files/gitea/gitea-dump.sh.j2
+++ b/files/gitea/gitea-dump.sh.j2
@@ -5,7 +5,7 @@ set -o pipefail
 
 echo "Gitea: backup data with gitea dump"
 
-(cd {{ base_dir }} && docker compose exec -u "{{ user_create_result.uid }}:{{ user_create_result.group }}" -w /backups gitea_web_app gitea dump -c /data/gitea/conf/app.ini)
+(cd {{ base_dir }} && docker compose exec -u "{{ user_create_result.uid }}:{{ user_create_result.group }}" -w /backups gitea_app gitea dump -c /data/gitea/conf/app.ini)
 
 
 echo "Gitea: remove old backups"
diff --git a/files/homepage/docker-compose.yml b/files/homepage/docker-compose.yml
index 3ed9236..ff23d44 100644
--- a/files/homepage/docker-compose.yml
+++ b/files/homepage/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
-  homepage-web:
+  homepage_app:
     image: "${WEB_SERVICE_IMAGE}"
+    container_name: homepage_app
     ports:
       - "127.0.0.1:${WEB_SERVICE_PORT}:80"
     restart: unless-stopped
diff --git a/files/keycloak/docker-compose.yml.j2 b/files/keycloak/docker-compose.yml.j2
index a653887..c4fff37 100644
--- a/files/keycloak/docker-compose.yml.j2
+++ b/files/keycloak/docker-compose.yml.j2
@@ -7,9 +7,9 @@
 
 services:
 
-  keycloak_web_app:
+  keycloak_app:
     image: quay.io/keycloak/keycloak:24.0.4
-    container_name: keycloak_web_app
+    container_name: keycloak_app
     command: ["start-dev"]
     restart: unless-stopped
     environment:
diff --git a/playbook-gitea.yml b/playbook-gitea.yml
index 96575f8..58e382f 100644
--- a/playbook-gitea.yml
+++ b/playbook-gitea.yml
@@ -27,7 +27,6 @@
           DOCKER_PREFIX: "{{ app_name }}"
           IMAGE_PREFIX: "{{ app_name }}"
           CONTAINER_PREFIX: "{{ app_name }}"
-          WEB_SERVER_PORT: "127.0.0.1:{{ gitea_port }}"
           USER_UID: "{{ user_create_result.uid }}"
           USER_GID: "{{ user_create_result.group }}"