diff --git a/templates/compose/cadvisor.yml.j2 b/templates/compose/cadvisor.yml.j2
index 3650c39..2dbe229 100644
--- a/templates/compose/cadvisor.yml.j2
+++ b/templates/compose/cadvisor.yml.j2
@@ -10,7 +10,7 @@ services:
       - "--docker_only=true"
       - "--disable_metrics=percpu,sched,tcp,udp,disk,diskIO,hugetlb,referenced_memory,cpu_topology,resctrl"
     ports:
-      - {{ cadvisor_port | default("8080") }}:{{ cadvisor_port | default("8080") }}
+      - {{ cadvisor_port | default("8080") }}:8080
     labels:
       com.centurylinklabs.watchtower.enable: {{ cadvisor_watchtower_enable | default('true') }}
     volumes:
diff --git a/templates/compose/wikijs.yml.j2 b/templates/compose/wikijs.yml.j2
index c6b654e..8129817 100644
--- a/templates/compose/wikijs.yml.j2
+++ b/templates/compose/wikijs.yml.j2
@@ -55,7 +55,7 @@ services:
 {% endfor %}
 {% endif %}
     ports:
-      - 3001:3000
+      - {{ wikijs_port | default("3000") }}:3000
     networks:
       - wikijs
       - traefik