diff --git a/config b/config
index aba4dd7..4d405dc 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit aba4dd7fbc0a017c7a588cc7434093a75926cb70
+Subproject commit 4d405dcd2ddf6598c13bbdbc3a82590f4c26d0a8
diff --git a/templates/gotosocial/config.yaml.gotmpl b/templates/gotosocial/config.yaml.gotmpl
index 7fd8acc..80512e2 100644
--- a/templates/gotosocial/config.yaml.gotmpl
+++ b/templates/gotosocial/config.yaml.gotmpl
@@ -1,5 +1,5 @@
 #  GoToSocial
-#  Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+#  Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org
 
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU Affero General Public License as published by
@@ -30,6 +30,11 @@ log-level: "{{ .GoToSocial.LogLevel }}"
 # Default: false
 log-db-queries: false
 
+# Bool. Include the client IP in the emitted log lines
+# Options: [true, false]
+# Default: true
+log-client-ip: true
+
 # String. Application name to use internally.
 # Examples: ["My Application","gotosocial"]
 # Default: "gotosocial"
@@ -103,7 +108,7 @@ port: {{ .GoToSocial.Port }}
 # If you're running inside a Docker container behind Traefik or Nginx, for example, add the subnet of your docker network,
 # or the gateway of the docker network, and/or the address of the reverse proxy (if it's not running on the host network).
 # Example: ["127.0.0.1/32", "172.20.0.1"]
-# Default: ["127.0.0.1/32"] (localhost)
+# Default: ["127.0.0.1/32", "::1"] (localhost ipv4 + ipv6)
 trusted-proxies:
 - "{{ .DockerNetworkSubnet }}"
 
@@ -770,6 +775,28 @@ syslog-address: "localhost:514"
 # Default: "X-Request-Id"
 request-id-header: "X-Request-Id"
 
+# Bool. Enable OpenTelemetry based tracing support.
+# Default: false
+tracing-enabled: false
+
+# String. Set the transport protocol for the tracing system. Can either be "grpc" for
+# OTLP gRPC or "jaeger" for jaeger based ingesters.
+# Options: ["grpc", "jaeger"]
+# Default: "grpc"
+tracing-transport: "grpc"
+
+# String. Endpoint of the trace ingester. When using the gRPC based transport, the
+# endpoint is usually a single address/port combination. For the jaeger transport it
+# should be a fully qualified URL.
+# OTLP gRPC or "jaeger" for jaeger based ingesters
+# Examples: ["localhost:4317", "http://localhost:14268/api/traces"]
+# Default: ""
+tracing-endpoint: ""
+
+# Bool. Disable HTTPS for the gRPC transport protocol.
+# Default: false
+tracing-insecure-transport: false
+
 #############################
 ##### ADVANCED SETTINGS #####
 #############################