diff --git a/roles/docker-wordpress/tasks/discourse/generate-api-key.yml b/roles/docker-wordpress/tasks/discourse/generate-api-key.yml
index 136e3ae9..84463409 100644
--- a/roles/docker-wordpress/tasks/discourse/generate-api-key.yml
+++ b/roles/docker-wordpress/tasks/discourse/generate-api-key.yml
@@ -1,37 +1,38 @@
-- name: "Revoke old WP Discourse API keys via Rails"
+---
+- name: Add /var/www/discourse to Git safe.directory
   command: >
-    docker exec {{ applications.discourse.container }}
-      rails runner "
-        user = User.find_by_username('system')
-        ApiKey
-          .where(
-            user_id: user.id,
-            description: 'WP Discourse Integration',
-            revoked_at: nil
-          )
-          .update_all(revoked_at: Time.current)
-      "
+    docker exec {{ applications.discourse.container }} \
+      git config --global --add safe.directory /var/www/discourse
   args:
     chdir: "{{ docker_compose.directories.instance }}"
+  changed_when: false
+
+- name: Revoke old WP Discourse API keys via Rails
+  command: >
+    docker exec {{ applications.discourse.container }} bash -lc "\
+      cd /var/www/discourse && \
+      script/rails runner \"\
+        ApiKey.where(\
+          user_id: User.find_by_username('system').id,\
+          description: 'WP Discourse Integration',\
+          revoked_at: nil\
+        ).update_all(revoked_at: Time.current)\
+      \""
+  args:
+    chdir: "{{ docker_compose.directories.instance }}"
+  changed_when: false
   failed_when: false
 
-- name: "Generate new WP Discourse API key via Rails"
+- name: Generate new WP Discourse API key via Rake task
   command: >
-    docker exec {{ applications.discourse.container }}
-      rails runner "
-        user = User.find_by_username('system')
-        ak   = ApiKey.create!(
-                 user_id:     user.id,
-                 token:       SecureRandom.hex,
-                 description: 'WP Discourse Integration'
-               )
-        puts ak.token
-      "
+    docker exec {{ applications.discourse.container }} bash -lc "\
+      cd /var/www/discourse && \
+      bin/rake api_key:create_master['WP Discourse Integration']\
+    "
   args:
     chdir: "{{ docker_compose.directories.instance }}"
   register: discourse_generated_api_key
-  failed_when: false
 
-- name: "Set fact for new WP Discourse API key"
+- name: Store the new WP Discourse API key in a fact
   set_fact:
-    vault_discourse_api_key: "{{ discourse_generated_api_key.stdout_lines[0] }}"
\ No newline at end of file
+    vault_discourse_api_key: "{{ discourse_generated_api_key.stdout | trim }}"
diff --git a/templates/vars/applications.yml.j2 b/templates/vars/applications.yml.j2
index 1233dde4..2af5f0c6 100644
--- a/templates/vars/applications.yml.j2
+++ b/templates/vars/applications.yml.j2
@@ -272,7 +272,7 @@ defaults_applications:
     users:
       administrator:
         username:                     "{{users.administrator.username}}"          # Listmonk administrator account username
-        password:                     "{{users.administrator.password}}"          # Password to initialized Listmonk administrator with
+#        password:                     "{{users.administrator.password}}"          # Password to initialized Listmonk administrator with
     public_api_activated:             False                                       # Security hole. Can be used for spaming
     version:                          "latest"                                    # Docker Image version
     setup:                            false                                       # Set true in inventory file to execute the setup and initializing procedures
@@ -281,7 +281,7 @@ defaults_applications:
   'css':      true,
   'iframe':   true,
   'database': true,
-  'oidc':     true,
+  'oidc':     true
 }) }}{% raw %}
 
   mailu: