diff --git a/ansible/playbooks/nanna-docker.yaml b/ansible/playbooks/nanna-docker.yaml
index 3bf2dee..30bc12c 100644
--- a/ansible/playbooks/nanna-docker.yaml
+++ b/ansible/playbooks/nanna-docker.yaml
@@ -11,6 +11,12 @@
         create_home: false
         system: true
       loop:
+        - name: postgres
+          uid: 70
+          state: present
+        - name: hackmd
+          uid: 1500
+          state: present
         - name: gitea
           uid: 42001
           state: present
@@ -48,10 +54,13 @@
         # This is true by default but I put it here anyways
         # to emphasize what's happening
         decrypt: true
-      # Not quite happy with all the seperate loops yet.
       loop:
         - name: gitea
           state: present
+        - name: codi
+          state: present
+    # This needs to be done for any services where user:
+    # is set in docker-compose.yaml.
     - name: Create volume directories with correct permissions
       become: true
       ansible.builtin.file:
@@ -65,3 +74,39 @@
           user: caddy
         - name: caddy_data
           user: caddy
+    # Since some docker-compose configuration might want to pull
+    # images from the Gitea package repository, we need to ensure
+    # that Gitea is reachable before those configurations are deployed.
+    - name: Set up caddy and gitea containers
+      become: true
+      community.docker.docker_compose_v2:
+        project_src: "/etc/pbri/docker/{{ item.name }}"
+        state: "{{ item.state }}"
+        build: "always"
+        pull: "always"
+      loop:
+        - name: caddy
+          state: present
+        - name: gitea
+          state: present
+    # Before deploying the remaining configs below, we check that
+    # Gitea is reachable at git.pbrinkmeier.de
+    - name: Wait for gitea to be reachable
+      check_mode: false
+      ansible.builtin.uri:
+        method: GET
+        url: https://git.pbrinkmeier.de/api/v1/version
+      register: gitea_version_response
+      until: gitea_version_response.status == 200
+      retries: 10
+      delay: 3  # Retry every 3 seconds
+    - name: Set up other containers
+      become: true
+      community.docker.docker_compose_v2:
+        project_src: "/etc/pbri/docker/{{ item.name }}"
+        state: "{{ item.state }}"
+        build: "always"
+        pull: "always"
+      loop:
+        - name: codi
+          state: present
diff --git a/docker/docker/caddy/Dockerfile b/docker/docker/caddy/Dockerfile
index 6423087..f5ca7cd 100644
--- a/docker/docker/caddy/Dockerfile
+++ b/docker/docker/caddy/Dockerfile
@@ -1,3 +1,4 @@
 FROM caddy
 
-COPY Caddyfile /etc/caddy/Caddyfile
\ No newline at end of file
+COPY Caddyfile /etc/caddy/Caddyfile
+RUN chown 42002:42002 /etc/caddy/Caddyfile