diff --git a/README.md b/README.md
index 9952c3a..a01d6a7 100644
--- a/README.md
+++ b/README.md
@@ -33,15 +33,18 @@ If you find new miners or other malicious stuff, please add those signatures to
 
 ## Ansible
 
-1. Your playbook should define the following variables:
-    ```
-    galaxy_config_file: /path/to/galaxy.yml
-    galaxy_log_dir: /path/to/galaxy/log/dir
-    galaxy_pg_db: galaxy
-    galaxy_pg_user: galaxy
-    galaxy_pg_host: my-db-server.usegalaxy.org
-    galaxy_pulsar_app_conf: /path/to/pulsar/app.yml
 1. Consult `defaults/main.yml` for available walle variables
+1. You can overwrite or append to `walle_env_vars` by defining `walle_extra_env_vars`
+   in your playbook:
+    ```yml
+    # These values will replace the defaults
+    walle_extra_env_vars:
+    - key: GALAXY_PULSAR_APP_CONF
+      value: "{{ galaxy_config_dir }}/my_pulsar_app.yml"
+    - key: GXADMIN_PATH
+      value: /usr/bin/gxadmin
+    ```
+
 
 ## Usage
 From the tool's help command:
@@ -107,7 +110,6 @@ optional arguments:
   --tool TOOL           A string to filter tools in the tool_id column of currently running jobs.
                          Use like 'grep' after the gxadmin query queue-details command.
   -v, --verbose         Report details for every match.
-  -d, --debug           Emit additional log messages for debugging Wall-E.
   -i, --interactive     Show table header.
   --delete-user MIN_SEVERITY
                         Delete user when the found malware's severity level is equal or higher than this value.
diff --git a/defaults/main.yml b/defaults/main.yml
index 893b1e9..afff269 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -22,18 +22,18 @@ walle_envs_database:
     value: "{{ walle_malware_database_location }}/{{ walle_database_file }}"
   - key: PGPASSFILE
     value: "{{ walle_pgpass_file }}"
-  - key: PGHOST
-    value: "{{ galaxy_pg_host }}"
-  - key: PGUSER
-    value: "{{ galaxy_pg_user }}"
-  - key: PGDATABASE
-    value: "{{ galaxy_pg_db }}"
   - key: GALAXY_CONFIG_FILE
     value: "{{ galaxy_config_dir }}/galaxy.yml"
-  - key: GALAXY_PULSAR_APP_CONF
-    value: "{{ galaxy_pulsar_app_conf }}"
   - key: GALAXY_LOG_DIR
     value: "{{ galaxy_log_dir }}"
+  - key: PGHOST
+    value: 127.0.0.1
+  - key: PGUSER
+    value: galaxy
+  - key: PGDATABASE
+    value: galaxy
+  - key: GALAXY_PULSAR_APP_CONF
+    value: "{{ galaxy_config_dir }}/pulsar_app.yml"
   - key: GXADMIN_PATH
     value: /usr/local/bin/gxadmin