diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml
index 01fcd7340..f9573ec69 100644
--- a/roles/6-generic-apps/tasks/main.yml
+++ b/roles/6-generic-apps/tasks/main.yml
@@ -45,6 +45,12 @@
   when: wordpress_install
   tags: wordpress
 
+- name: GITEA
+  include_role:
+    name: gitea
+  when: gitea_install
+  tags: gitea
+
 - name: Recording STAGE 6 HAS COMPLETED ====================
   lineinfile:
     dest: "{{ iiab_env_file }}"
diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml
index 471869e7a..2bcbcfda2 100644
--- a/roles/gitea/defaults/main.yml
+++ b/roles/gitea/defaults/main.yml
@@ -1,4 +1,7 @@
 ---
+#gitea_install: True
+#gitea_enabled: True
+
 # Using @coolaj86's script as a template
 # https://git.coolaj86.com/coolaj86/gitea-installer.sh
 
@@ -36,9 +39,6 @@ gitea_user: gitea
 gitea_run_directory: "{{ gitea_root_directory }}"
 gitea_db_directory: "/library/dbdata/gitea"
 
-gitea_install: True
-gitea_enabled: True
-
 gitea_url: /gitea
 gitea_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}{{ gitea_url }}"
 
diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 2bbd8fe7b..32df38398 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -290,6 +290,10 @@ elgg_mysql_password: elgg4kids
 ejabberd_install: False
 ejabberd_enabled: False
 
+# Gitea
+gitea_install: False
+gitea_enabled: False
+
 # Nextcloud
 nextcloud_install: True
 nextcloud_enabled: False
diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml
index 5548682bb..1dde57bed 100644
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@@ -170,6 +170,9 @@ elgg_enabled: True
 ejabberd_install: True
 ejabberd_enabled: False
 
+gitea_install: True
+gitea_enabled: True
+
 nextcloud_install: True
 nextcloud_enabled: True
 
diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml
index 26e3e3b0d..917e9892c 100644
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@@ -170,6 +170,9 @@ elgg_enabled: True
 ejabberd_install: False
 ejabberd_enabled: False
 
+gitea_install: True
+gitea_enabled: False
+
 nextcloud_install: True
 nextcloud_enabled: True
 
diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml
index 71d10826f..feea2748e 100644
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@@ -170,6 +170,9 @@ elgg_enabled: False
 ejabberd_install: False
 ejabberd_enabled: False
 
+gitea_install: False
+gitea_enabled: False
+
 nextcloud_install: False
 nextcloud_enabled: False