diff --git a/tasks/bootstrap_user.yml b/tasks/bootstrap_user.yml
index a6a1bf705ca1..963b474d5367 100644
--- a/tasks/bootstrap_user.yml
+++ b/tasks/bootstrap_user.yml
@@ -16,6 +16,10 @@
   command: chdir={{ galaxy_server_dir }} {{ galaxy_venv_dir }}/bin/python manage_bootstrap_user.py -c {{ galaxy_config_file }} delete
   when: delete_user is defined and delete_user
 
+- name: Remove bootstrap user as Galaxy Admin
+  lineinfile: dest={{ galaxy_config_file }} state=absent insertafter="app:main" regexp="admin_users =" line="admin_users = {{ galaxy_tools_admin_user }}"  #"
+  when: delete_user is defined and delete_user
+
 - include: restart_galaxy.yml
 
 - name: Remove the bootstrap user management script