diff --git a/README.md b/README.md
index 54daa70..aae51fa 100644
--- a/README.md
+++ b/README.md
@@ -231,7 +231,6 @@ Either you define exactly which release you install. Or you use the option ``lat
 ### Picture ([picture](https://docs.gitea.io/en-us/config-cheat-sheet/#picture-picture))
 | variable name | default value | description |
 | ------------- | ------------- | ----------- |
-| `gitea_disable_gravatar` | `true` | Do you want to disable Gravatar ? (privacy and so on) (true/false) |
 | `gitea_picture_extra_config` | `''` | you can use this variable to pass additional config parameters in the `[picture]` section of the config. |
 
 ### Issue and pull request attachments ([attachment](https://docs.gitea.io/en-us/config-cheat-sheet/#issue-and-pull-request-attachments-attachment))
@@ -245,20 +244,28 @@ Either you define exactly which release you install. Or you use the option ``lat
 | ------------- | ------------- | ----------- |
 | `gitea_log_systemd` | `false` | Disable logging into `file`, use systemd-journald |
 | `gitea_log_level` | `Warn` | General log level. `[Trace, Debug, Info, Warn, Error, Critical, Fatal, None]` |
-| `gitea_log_extra_config` | `''` | you can use this variable to pass additional config parameters in the `[log]` section of the config. |
+| `gitea_log_extra_config` | | you can use this variable to pass additional config parameters in the `[log]` section of the config. |
 
 ### Metrics ([metrics](https://docs.gitea.io/en-us/config-cheat-sheet/#metrics-metrics))
 | variable name | default value | description |
 | ------------- | ------------- | ----------- |
 | `gitea_metrics_enabled`| `false` | Enable the metrics endpoint |
-| `gitea_metrics_token`| `''` | Bearer token for the Prometheus scrape job |
+| `gitea_metrics_token`| | Bearer token for the Prometheus scrape job |
+| `gitea_metrics_extra` | | you can use this variable to pass additional config parameters in the `[metrics]` section of the config. |
 
 ### OAuth2 ([oauth2](https://docs.gitea.io/en-us/config-cheat-sheet/#oauth2-oauth2))
 | variable name | default value | description |
 | ------------- | ------------- | ----------- |
 | `gitea_oauth2_enabled` | `true` | Enable the Oauth2 provider (true/false) |
-| `gitea_oauth2_jwt_secret` | `''` | Oauth2 JWT secret. Can be generated with ``gitea generate secret JWT_SECRET``. Will be autogenerated if not defined. |
-| `gitea_oauth2_extra_config` | `''` | you can use this variable to pass additional config parameters in the `[oauth2]` section of the config. |
+| `gitea_oauth2_jwt_secret` |  | Oauth2 JWT secret. Can be generated with ``gitea generate secret JWT_SECRET``. Will be autogenerated if not defined. |
+| `gitea_oauth2_extra_config` |  | you can use this variable to pass additional config parameters in the `[oauth2]` section of the config. |
+
+### Federation ([federation](https://docs.gitea.io/en-us/config-cheat-sheet/#federation-federation))
+| variable name | default value | description |
+| ------------- | ------------- | ----------- |
+| `gitea_federation_enabled` | `false` | Enable/Disable federation capabilities |
+| `gitea_federation_share_user_stats` | `false` | Enable/Disable user statistics for nodeinfo if federation is enabled |
+| `gitea_federation_extra` | | you can use this variable to pass additional config parameters in the `[federation]` section of the config. |
 
 ### additional gitea config
 | variable name | default value | description |
diff --git a/defaults/main.yml b/defaults/main.yml
index 71e4ae9..087e799 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -178,27 +178,38 @@ gitea_session_provider: 'file'
 gitea_session_extra_config: ''
 
 # Picture (picture)
-gitea_disable_gravatar: true
+# -> https://docs.gitea.io/en-us/config-cheat-sheet/#picture-picture
 gitea_picture_extra_config: ''
 
 # Issue and pull request attachments (attachment)
+# -> https://docs.gitea.io/en-us/config-cheat-sheet/#issue-and-pull-request-attachments-attachment
 gitea_attachment_enabled: true
 gitea_attachment_extra_config: ''
 
 # Log (log)
+# -> https://docs.gitea.io/en-us/config-cheat-sheet/#log-log
 gitea_log_systemd: false
 gitea_log_level: 'Warn'
 gitea_log_extra_config: ''
 
 # Metrics (metrics)
+# -> https://docs.gitea.io/en-us/config-cheat-sheet/#metrics-metrics
 gitea_metrics_enabled: false
 gitea_metrics_token: ''
+gitea_metrics_extra: ''
 
 # OAuth2 (oauth2)
+# -> https://docs.gitea.io/en-us/config-cheat-sheet/#oauth2-oauth2
 gitea_oauth2_enabled: true
 gitea_oauth2_jwt_secret: ''
 gitea_oauth2_extra_config: ''
 
+# Federation (federation)
+# -> https://docs.gitea.io/en-us/config-cheat-sheet/#federation-federation
+gitea_federation_enabled: false
+gitea_federation_share_user_stats: false
+gitea_federation_extra: ''
+
 # additional gitea config
 gitea_extra_config: ""
 
diff --git a/templates/gitea.ini.j2 b/templates/gitea.ini.j2
index 72c54d3..74581d5 100644
--- a/templates/gitea.ini.j2
+++ b/templates/gitea.ini.j2
@@ -201,15 +201,14 @@ PROVIDER_CONFIG = {{ gitea_home }}/data/sessions
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#picture-picture
 [picture]
 AVATAR_UPLOAD_PATH = {{ gitea_home }}/data/avatars
-DISABLE_GRAVATAR   = {{ gitea_disable_gravatar | ternary('true', 'false') }}
-{{ gitea_picture_extra_config }}
+{% if gitea_picture_extra_config != '' %}{{ gitea_picture_extra_config }}{% else %};{% endif %}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#issue-and-pull-request-attachments-attachment
 [attachment]
 ENABLED = {{ gitea_attachment_enabled | ternary('true', 'false') }}
 PATH    = {{ gitea_home }}/data/attachments
-{{ gitea_attachment_extra_config }}
+{% if gitea_attachment_extra_config != '' %}{{ gitea_attachment_extra_config }}{% else %};{% endif %}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#log-log
@@ -221,20 +220,29 @@ MODE       = console
 MODE       = file
 {% endif %}
 LEVEL      = {{ gitea_log_level }}
-{{ gitea_log_extra_config }}
+{% if gitea_log_extra_config != '' %}{{ gitea_log_extra_config }}{% else %};{% endif %}
 ;
 ;
 ; -> https://docs.gitea.io/en-us/config-cheat-sheet/#metrics-metrics
 [metrics]
 ENABLED = {{ gitea_metrics_enabled | ternary('true', 'false') }}
 TOKEN   = {{ gitea_metrics_token }}
+{% if gitea_metrics_extra != '' %}{{ gitea_metrics_extra }}{% else %};{% endif %}
 ;
 ;
 ; https://docs.gitea.io/en-us/config-cheat-sheet/#oauth2-oauth2
 [oauth2]
 ENABLE     = {{ gitea_oauth2_enabled | ternary('true', 'false') }}
 JWT_SECRET = {{ gitea_oauth2_jwt_secret }}
-{{ gitea_oauth2_extra_config }}
+{% if gitea_oauth2_extra_config != '' %}{{ gitea_oauth2_extra_config }}{% else %};{% endif %}
+;
+;
+; -> https://docs.gitea.io/en-us/config-cheat-sheet/#federation-federation
+[federation]
+ENABLED               = {{ gitea_federation_enabled | ternary('true', 'false') }}
+SHARE_USER_STATISTICS = {{ gitea_federation_share_user_stats | ternary('true', 'false') }}
+{% if gitea_federation_extra != '' %}{{ gitea_federation_extra }}{% else %};{% endif %}
+;
 ;
 ;
 ; Optional additional config