diff --git a/tasks/docker/docker.yml b/tasks/docker/docker.yml
index 2c5c0d6..5fa66f6 100644
--- a/tasks/docker/docker.yml
+++ b/tasks/docker/docker.yml
@@ -22,8 +22,8 @@
     state: directory
 
 - name: Create docker-compose.yaml file
-  copy:
-    src: files/docker-compose.yml
+  template:
+    src: templates/docker-compose.yml.j2
     dest: "{{ mastodon_composer_folder }}/docker-compose.yml"
 
 - name: Ensure mastodon configuration is present
diff --git a/files/docker-compose.yml b/templates/docker-compose.yml.j2
similarity index 97%
rename from files/docker-compose.yml
rename to templates/docker-compose.yml.j2
index c534286..8f4521d 100644
--- a/files/docker-compose.yml
+++ b/templates/docker-compose.yml.j2
@@ -12,6 +12,8 @@ services:
       - ./postgres14:/var/lib/postgresql/data
     environment:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
+    ports:
+      - {{ mastodon_db_port }}:5432
 
   redis:
     restart: always
@@ -22,6 +24,8 @@ services:
       test: ['CMD', 'redis-cli', 'ping']
     volumes:
       - ./redis:/data
+    ports:
+      - {{ redis_port }}:6379
 
   # es:
   #   restart: always