diff --git a/inventories/prod/group_vars/all.yml b/inventories/prod/group_vars/all.yml
new file mode 100644
index 0000000..ceeb024
--- /dev/null
+++ b/inventories/prod/group_vars/all.yml
@@ -0,0 +1 @@
+domain: cazzzer.com
diff --git a/inventories/staging/group_vars/all.yml b/inventories/staging/group_vars/all.yml
new file mode 100644
index 0000000..b64c48e
--- /dev/null
+++ b/inventories/staging/group_vars/all.yml
@@ -0,0 +1 @@
+domain: lab.cazzzer.com
diff --git a/roles/gitea/templates/docker-compose.yml.j2 b/roles/gitea/templates/docker-compose.yml.j2
index 817e980..d561421 100644
--- a/roles/gitea/templates/docker-compose.yml.j2
+++ b/roles/gitea/templates/docker-compose.yml.j2
@@ -11,11 +11,11 @@ volumes:
 
 services:
   server:
-    image: gitea/gitea:1.16.9
+    image: gitea/gitea:1.17.2
     container_name: gitea_server
     labels:
       - traefik.enable=true
-      - traefik.http.routers.gitea.rule=Host(`gitea.lab.cazzzer.com`)
+      - traefik.http.routers.gitea.rule=Host(`gitea.{{ domain }}`)
       - traefik.http.services.gitea.loadbalancer.server.port=3000
     restart: unless-stopped
     env_file:
@@ -25,8 +25,6 @@ services:
       - traefik_traefik
     volumes:
       - gitea:/data
-    ports:
-      - "8011:3000"
     depends_on:
       - db
   db:
diff --git a/roles/nextcloud/templates/docker-compose.yml.j2 b/roles/nextcloud/templates/docker-compose.yml.j2
index 1fabc01..140cf18 100644
--- a/roles/nextcloud/templates/docker-compose.yml.j2
+++ b/roles/nextcloud/templates/docker-compose.yml.j2
@@ -83,12 +83,10 @@ services:
     container_name: nextcloud_web
     labels:
       - traefik.enable=true
-      - traefik.http.routers.nextcloud.rule=Host(`nc.lab.cazzzer.com`)
+      - traefik.http.routers.nextcloud.rule=Host(`nc.{{ domain }}`)
     restart: unless-stopped
     links:
       - app
-    ports:
-      - "8012:80"
     networks:
       - traefik_traefik
       - default