diff --git a/devops/forgejo-server/docker-compose.yml b/devops/forgejo-server/docker-compose.yml
index 7610ef4..7732c6c 100644
--- a/devops/forgejo-server/docker-compose.yml
+++ b/devops/forgejo-server/docker-compose.yml
@@ -201,6 +201,8 @@ services:
     privileged: true
     environment:
       DOCKER_TLS_CERTDIR: /certs
+      # Include docker-dind hostname in TLS certificate
+      DOCKER_TLS_SAN: DNS:docker-dind,DNS:docker,DNS:localhost
     volumes:
       - dind-certs-ca:/certs/ca
       - dind-certs-client:/certs/client
diff --git a/devops/terraform/modules/forgejo/cloud-init.yaml.tpl b/devops/terraform/modules/forgejo/cloud-init.yaml.tpl
index 858fa0d..3cea45a 100644
--- a/devops/terraform/modules/forgejo/cloud-init.yaml.tpl
+++ b/devops/terraform/modules/forgejo/cloud-init.yaml.tpl
@@ -422,6 +422,7 @@ write_files:
           privileged: true
           environment:
             DOCKER_TLS_CERTDIR: /certs
+            DOCKER_TLS_SAN: DNS:docker-dind,DNS:docker,DNS:localhost
           volumes:
             - dind-certs-ca:/certs/ca
             - dind-certs-client:/certs/client