diff --git a/defaults/main.yml b/defaults/main.yml
index 4b4a10d..10cdd1b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,13 @@
 ---
 # Defaults
+gitea_web_install: "httpd"
+gitea_web_config: "true"
+gitea_web_config_certs_internal: "true"
+gitea_web_config_certs_external: "false"
+gitea_themes: "auto,gitea,arc-green,gitea-blue,gitea-modern,carbonred,darkred,pitchblack"
+gitea_basename: "git.resf.org"
+gitea_automation_user: "rockyautomation"
+gitea_raise_memlock_nofile_limits: "true"
+gitea_net_cap: "true"
+gitea_server_admin: "infrastructure@rockylinux.org"
 ...
diff --git a/vars/common.yml b/vars/common.yml
index 8dcc4de..431625a 100644
--- a/vars/common.yml
+++ b/vars/common.yml
@@ -1,16 +1,5 @@
 ---
-gitea_web_install: "httpd"
 gitea_web_username: "{% if gitea_web_install == 'httpd' %}apache{% else %}{{ gitea_web_install }}{% endif %}"
-gitea_web_config: "true"
-gitea_web_config_certs_internal: "false"
-gitea_web_config_certs_external: "false"
-gitea_themes: "auto,gitea,arc-green,gitea-blue,gitea-modern,carbonred,darkred,pitchblack"
-gitea_basename: "git.resf.org"
-gitea_automation_user: "rockyautomation"
-gitea_raise_memlock_nofile_limits: "true"
-gitea_net_cap: "true"
-gitea_server_admin: "infrastructure@rockylinux.org"
-
 # Certs issued by FreeIPA Only
 ipa_getcert_requested_hostnames:
   - name: "{{ ansible_fqdn }}"