diff --git a/docs/configuring-awx-system.md b/docs/configuring-awx-system.md
index 87ea228a9..f455f0587 100644
--- a/docs/configuring-awx-system.md
+++ b/docs/configuring-awx-system.md
@@ -26,7 +26,7 @@ The following repositories allow you to copy and use this setup:
 
 Updates to this section are trailed here:
 
-[GoMatrixHosting Matrix Docker Ansible Deploy](https://gitlab.com/GoMatrixHosting/gomatrixhosting-matrix-docker-ansible-deploy)
+[GoMatrixHosting Matrix Docker Ansible Deploy](https://gitlab.com/GoMatrixHosting/matrix-docker-ansible-deploy)
 
 
 ## Does I need an AWX setup to use this? How do I configure it? 
diff --git a/roles/matrix-awx/tasks/main.yml b/roles/matrix-awx/tasks/main.yml
index 6e192ce0f..0b804e17a 100755
--- a/roles/matrix-awx/tasks/main.yml
+++ b/roles/matrix-awx/tasks/main.yml
@@ -25,7 +25,7 @@
   when: run_setup|bool and matrix_awx_enabled|bool
   tags:
     - backup-server
-    
+
 # Perform a export of the server
 - include_tasks: 
     file: "export_server.yml"
@@ -62,6 +62,15 @@
   tags:
     - purge-database
 
+# Rotate SSH key if called
+- include_tasks: 
+    file: "rotate_ssh.yml"
+    apply:
+      tags: rotate-ssh
+  when: run_setup|bool and matrix_awx_enabled|bool
+  tags:
+    - rotate-ssh
+
 # Import configs, media repo from /chroot/backup import
 - include_tasks: 
     file: "import_awx.yml"
diff --git a/roles/matrix-awx/tasks/rename_variables.yml b/roles/matrix-awx/tasks/rename_variables.yml
index e8992bd8a..d9a636773 100644
--- a/roles/matrix-awx/tasks/rename_variables.yml
+++ b/roles/matrix-awx/tasks/rename_variables.yml
@@ -5,4 +5,3 @@
     path: "/var/lib/awx/projects/clients/{{ member_id }}/{{ subscription_id }}/matrix_vars.yml"
     regexp: 'matrix_synapse_use_presence'
     replace: 'matrix_synapse_presence_enabled'
-
diff --git a/roles/matrix-awx/tasks/rotate_ssh.yml b/roles/matrix-awx/tasks/rotate_ssh.yml
new file mode 100644
index 000000000..8383e81eb
--- /dev/null
+++ b/roles/matrix-awx/tasks/rotate_ssh.yml
@@ -0,0 +1,15 @@
+
+- name: Set the new authorized key taken from file
+  authorized_key:
+    user: root
+    state: present
+    exclusive: yes
+    key: "{{ lookup('file', '/var/lib/awx/projects/hosting/client_public.key') }}"
+
+- name: Set boolean value to exit playbook
+  set_fact:
+    end_playbook: true
+
+- name: End playbook if this task list is called.
+  meta: end_play
+  when: end_playbook is defined and end_playbook|bool
diff --git a/setup.yml b/setup.yml
index 21d67f1a8..282df2e15 100755
--- a/setup.yml
+++ b/setup.yml
@@ -56,4 +56,4 @@
     - matrix-aux
     - matrix-postgres-backup
     - matrix-prometheus-postgres-exporter
-    - matrix-common-after
\ No newline at end of file
+    - matrix-common-after