diff --git a/defaults/main.yml b/defaults/main.yml
index 2051dc4..449be5a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -34,9 +34,10 @@ crayfish_db_name: gemini
 crayfish_db_driver: "{% if crayfish_db == 'mysql' %}pdo_mysql{% elif crayfish_db == 'pgsql' %}pdo_pgsql{% endif %}"
 crayfish_db_port: "{% if crayfish_db == 'mysql' %}3306{% elif crayfish_db == 'pgsql' %}5432{% endif %}"
 
-crayfish_fedora_base_url: http://localhost:8080/fcrepo/rest
 crayfish_drupal_base_url: http://localhost:8000
 crayfish_gemini_base_url: http://localhost:8000/gemini
+crayfish_gemini_fedora_domain:
+crayfish_gemini_drupal_domain:
 
 # Gemini default config
 crayfish_gemini_log_file: /var/log/islandora/gemini.log
diff --git a/templates/Gemini.config.yaml.j2 b/templates/Gemini.config.yaml.j2
index fe2ab85..d57984f 100644
--- a/templates/Gemini.config.yaml.j2
+++ b/templates/Gemini.config.yaml.j2
@@ -2,7 +2,11 @@
 
 # managed by Ansible
 
-fedora_base_url: {{ crayfish_gemini_fedora_base_url }}
+# Leave these blank unless you know what you're doing.  If you're moving
+# data from one server to another and the domain changes, set these
+# to your new domain.
+fedora_domain: {{ crayfish_gemini_fedora_domain }}
+drupal_domain: {{ crayfish_gemini_drupal_domain }}
 
 debug: {{ crayfish_gemini_debug }}