diff --git a/defaults/main.yml b/defaults/main.yml
index c0d1654..7c03f38 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -18,6 +18,9 @@ crayfish_pgsql_user: postgres
 crayfish_db_user: crayfish
 crayfish_db_password: islandora
 crayfish_db_name: gemini
+crayfish_db_host: 127.0.0.1 
+crayfish_db_root_user: "{% if crayfish_db == 'mysql' %}root{% elif crayfish_db == 'pgsql' %}{{ crayfish_pgsql_user }}{% endif %}" 
+crayfish_db_root_password: "{{ crayfish_db_password }}"
 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 %}"
 
@@ -38,7 +41,7 @@ crayfish_gemini_jwt_config: ../syn-settings.xml
 
 crayfish_gemini_db_options:
   driver: "{{ crayfish_db_driver }}"
-  host: 127.0.0.1
+  host: "{{ crayfish_db_host }}"
   port: "{{ crayfish_db_port }}"
   dbname: "{{ crayfish_db_name }}"
   user: "{{ crayfish_db_user }}"
diff --git a/tasks/db-mysql.yml b/tasks/db-mysql.yml
index fbe1d13..42f9709 100644
--- a/tasks/db-mysql.yml
+++ b/tasks/db-mysql.yml
@@ -3,6 +3,10 @@
 - name: Create Gemini DB (mysql)
   mysql_db:
     name: "{{ crayfish_db_name }}"
+    login_host: "{{ crayfish_db_host }}"
+    login_port: "{{ crayfish_db_port }}"
+    login_user: "{{ crayfish_db_root_user }}"
+    login_password:  "{{ crayfish_db_root_password }}"
     state: present
   register: gemini_db_exists
 
@@ -10,5 +14,11 @@
   mysql_user:
     name: "{{ crayfish_db_user }}"
     password: "{{ crayfish_db_password }}"
+    login_host: "{{ crayfish_db_host }}"
+    login_port: "{{ crayfish_db_port }}"
+    login_user: "{{ crayfish_db_root_user }}"
+    login_password:  "{{ crayfish_db_root_password }}"
     state: present
     priv: "{{crayfish_db_name}}.*:ALL"
+    host: "%"
+
diff --git a/tasks/db-pgsql.yml b/tasks/db-pgsql.yml
index f09aba1..88d82cb 100644
--- a/tasks/db-pgsql.yml
+++ b/tasks/db-pgsql.yml
@@ -4,10 +4,18 @@
   postgresql_user:
     name: "{{ crayfish_db_user }}"
     password: "{{ crayfish_db_password }}"
+    login_host: "{{ crayfish_db_host }}"
+    login_port: "{{ crayfish_db_port }}"
+    login_user: "{{ crayfish_db_root_user }}"
+    login_password:  "{{ crayfish_db_root_password }}"
 
 - name: Create Gemini DB (pgsql)
   postgresql_db:
     name: "{{ crayfish_db_name }}"
     state: present
     owner: "{{ crayfish_db_user }}"
+    login_host: "{{ crayfish_db_host }}"
+    login_port: "{{ crayfish_db_port }}"
+    login_user: "{{ crayfish_db_root_user }}"
+    login_password:  "{{ crayfish_db_root_password }}"
   register: gemini_db_exists
diff --git a/tasks/main.yml b/tasks/main.yml
index 83a1642..fdf91b6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -48,6 +48,11 @@
     - crayfish-install
     - crayfish-gemini
 
+- include: install.yml
+  tags:
+    - crayfish
+    - crayfish-install
+
 - include: db-mysql.yml
   when: crayfish_db == 'mysql'
   tags:
@@ -66,11 +71,6 @@
     - crayfish-install
     - crayfish-gemini
 
-- include: install.yml
-  tags:
-    - crayfish
-    - crayfish-install
-
 - include: gemini.yml
   tags:
     - crayfish
diff --git a/vars/Debian.yml b/vars/Debian.yml
index d02311b..9980580 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -14,4 +14,7 @@ __crayfish_packages:
   - tesseract-ocr-srp
   - ffmpeg
   - poppler-utils
+  - python-psycopg2
+  - python-mysqldb
+  - mysql-client 
 __crayfish_db: mysql
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 0c50345..a78477d 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -14,4 +14,7 @@ __crayfish_packages:
   - tesseract-langpack-srp
   - ffmpeg
   - poppler-utils
+  - python-psycopg2
+  - python-mysqldb
+  - mysql-client
 __crayfish_db: mysql