diff --git a/group_vars/testing.yml b/group_vars/testing.yml
index a449c70..c27a1ff 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
-forgejo_use_https:     no
+gitea_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 338f58c..378f819 100644
--- a/roles/caddy/defaults/main.yml
+++ b/roles/caddy/defaults/main.yml
@@ -9,4 +9,3 @@ 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 6a13848..b104a25 100644
--- a/roles/caddy/templates/config.json.j2
+++ b/roles/caddy/templates/config.json.j2
@@ -51,19 +51,17 @@
     {% 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 %}
               },
               {
-                "api_key": "{{ caddy_zerossl_api_key }}",
+        {%- if caddy_email is not undefined and not none %}   
+                "email": "{{ caddy_email }}",
+        {% endif %}
                 "module": "zerossl"
               }
-    {% else %}
-              }
-    {% endif %}
             ]
           }
         ]
diff --git a/roles/forgejo/README.md b/roles/gitea/README.md
similarity index 100%
rename from roles/forgejo/README.md
rename to roles/gitea/README.md
diff --git a/roles/forgejo/defaults/main.yml b/roles/gitea/defaults/main.yml
similarity index 100%
rename from roles/forgejo/defaults/main.yml
rename to roles/gitea/defaults/main.yml
diff --git a/roles/forgejo/files/forgejo b/roles/gitea/files/forgejo
similarity index 100%
rename from roles/forgejo/files/forgejo
rename to roles/gitea/files/forgejo
diff --git a/roles/forgejo/handlers/main.yml b/roles/gitea/handlers/main.yml
similarity index 100%
rename from roles/forgejo/handlers/main.yml
rename to roles/gitea/handlers/main.yml
diff --git a/roles/forgejo/meta/main.yml b/roles/gitea/meta/main.yml
similarity index 100%
rename from roles/forgejo/meta/main.yml
rename to roles/gitea/meta/main.yml
diff --git a/roles/forgejo/tasks/Ubuntu.yml b/roles/gitea/tasks/Ubuntu.yml
similarity index 100%
rename from roles/forgejo/tasks/Ubuntu.yml
rename to roles/gitea/tasks/Ubuntu.yml
diff --git a/roles/forgejo/tasks/main.yml b/roles/gitea/tasks/main.yml
similarity index 100%
rename from roles/forgejo/tasks/main.yml
rename to roles/gitea/tasks/main.yml
diff --git a/roles/forgejo/templates/docker-stack.yml.j2 b/roles/gitea/templates/docker-stack.yml.j2
similarity index 100%
rename from roles/forgejo/templates/docker-stack.yml.j2
rename to roles/gitea/templates/docker-stack.yml.j2
diff --git a/roles/forgejo/templates/upstream.json.j2 b/roles/gitea/templates/upstream.json.j2
similarity index 100%
rename from roles/forgejo/templates/upstream.json.j2
rename to roles/gitea/templates/upstream.json.j2
diff --git a/roles/forgejo/templates/upstream_ci.json.j2 b/roles/gitea/templates/upstream_ci.json.j2
similarity index 100%
rename from roles/forgejo/templates/upstream_ci.json.j2
rename to roles/gitea/templates/upstream_ci.json.j2
diff --git a/roles/forgejo/vars/main.yml b/roles/gitea/vars/main.yml
similarity index 100%
rename from roles/forgejo/vars/main.yml
rename to roles/gitea/vars/main.yml
diff --git a/site.yml b/site.yml
index 0ed3a12..4b8e657 100644
--- a/site.yml
+++ b/site.yml
@@ -71,10 +71,10 @@
         role: landingpage
       tags: landingpage
 
-    - name: Install forgejo
+    - name: Install gitea
       import_role:
-        role: forgejo
-      tags: forgejo
+        role: gitea
+      tags: gitea
 
     - name: Install ntfy
       import_role: