diff --git a/group_vars/testing.yml b/group_vars/testing.yml
index c27a1ff..a449c70 100644
--- a/group_vars/testing.yml
+++ b/group_vars/testing.yml
@@ -7,7 +7,7 @@ caddy_tls_use_staging: yes
 
 blog_use_https:        no
 caddy_use_https:       no
-gitea_use_https:       no
+forgejo_use_https:     no
 landingpage_use_https: no
 miniflux_use_https:    no
 monica_use_https:      no
diff --git a/roles/caddy/defaults/main.yml b/roles/caddy/defaults/main.yml
index 378f819..338f58c 100644
--- a/roles/caddy/defaults/main.yml
+++ b/roles/caddy/defaults/main.yml
@@ -9,3 +9,4 @@ caddy_use_https: yes
 caddy_tls_use_staging: no
 # caddy_email: your@email.here
 
+# caddy_zerossl_api_key: your-zerossl-key-here-its-free
diff --git a/roles/caddy/templates/config.json.j2 b/roles/caddy/templates/config.json.j2
index b104a25..6a13848 100644
--- a/roles/caddy/templates/config.json.j2
+++ b/roles/caddy/templates/config.json.j2
@@ -51,17 +51,19 @@
     {% if caddy_tls_use_staging is sameas true %}
                 "ca": "https://acme-staging-v02.api.letsencrypt.org/directory",
     {% endif %}
-    {%- if caddy_email is not undefined and not none %}   
+    {%- if caddy_email is not undefined and not none %}
                 "email": "{{ caddy_email }}",
     {% endif %}
                 "module": "acme"
+    {%- if caddy_zerossl_api_key is not undefined and not none %}
               },
               {
-        {%- if caddy_email is not undefined and not none %}   
-                "email": "{{ caddy_email }}",
-        {% endif %}
+                "api_key": "{{ caddy_zerossl_api_key }}",
                 "module": "zerossl"
               }
+    {% else %}
+              }
+    {% endif %}
             ]
           }
         ]
diff --git a/roles/gitea/README.md b/roles/forgejo/README.md
similarity index 100%
rename from roles/gitea/README.md
rename to roles/forgejo/README.md
diff --git a/roles/gitea/defaults/main.yml b/roles/forgejo/defaults/main.yml
similarity index 100%
rename from roles/gitea/defaults/main.yml
rename to roles/forgejo/defaults/main.yml
diff --git a/roles/gitea/files/forgejo b/roles/forgejo/files/forgejo
similarity index 100%
rename from roles/gitea/files/forgejo
rename to roles/forgejo/files/forgejo
diff --git a/roles/gitea/handlers/main.yml b/roles/forgejo/handlers/main.yml
similarity index 100%
rename from roles/gitea/handlers/main.yml
rename to roles/forgejo/handlers/main.yml
diff --git a/roles/gitea/meta/main.yml b/roles/forgejo/meta/main.yml
similarity index 100%
rename from roles/gitea/meta/main.yml
rename to roles/forgejo/meta/main.yml
diff --git a/roles/gitea/tasks/Ubuntu.yml b/roles/forgejo/tasks/Ubuntu.yml
similarity index 100%
rename from roles/gitea/tasks/Ubuntu.yml
rename to roles/forgejo/tasks/Ubuntu.yml
diff --git a/roles/gitea/tasks/main.yml b/roles/forgejo/tasks/main.yml
similarity index 100%
rename from roles/gitea/tasks/main.yml
rename to roles/forgejo/tasks/main.yml
diff --git a/roles/gitea/templates/docker-stack.yml.j2 b/roles/forgejo/templates/docker-stack.yml.j2
similarity index 100%
rename from roles/gitea/templates/docker-stack.yml.j2
rename to roles/forgejo/templates/docker-stack.yml.j2
diff --git a/roles/gitea/templates/upstream.json.j2 b/roles/forgejo/templates/upstream.json.j2
similarity index 100%
rename from roles/gitea/templates/upstream.json.j2
rename to roles/forgejo/templates/upstream.json.j2
diff --git a/roles/gitea/templates/upstream_ci.json.j2 b/roles/forgejo/templates/upstream_ci.json.j2
similarity index 100%
rename from roles/gitea/templates/upstream_ci.json.j2
rename to roles/forgejo/templates/upstream_ci.json.j2
diff --git a/roles/gitea/vars/main.yml b/roles/forgejo/vars/main.yml
similarity index 100%
rename from roles/gitea/vars/main.yml
rename to roles/forgejo/vars/main.yml
diff --git a/site.yml b/site.yml
index 4b8e657..0ed3a12 100644
--- a/site.yml
+++ b/site.yml
@@ -71,10 +71,10 @@
         role: landingpage
       tags: landingpage
 
-    - name: Install gitea
+    - name: Install forgejo
       import_role:
-        role: gitea
-      tags: gitea
+        role: forgejo
+      tags: forgejo
 
     - name: Install ntfy
       import_role: