diff --git a/tasks/horizon_post_install.yml b/tasks/horizon_post_install.yml
index aef5f6df..82d41bf8 100644
--- a/tasks/horizon_post_install.yml
+++ b/tasks/horizon_post_install.yml
@@ -47,8 +47,6 @@
     - src: "{{ horizon_lib_dir }}/designatedashboard/enabled/_1722_dns_reversedns_panel.py"
       path: "{{ horizon_lib_dir }}/openstack_dashboard/local/enabled/_1722_dns_reversedns_panel.py"
   notify: Restart apache2
-  tags:
-    - horizon-configs
 
 - name: Enable the ironic-ui-dashboard Horizon panel
   file:
@@ -56,8 +54,6 @@
     path: "{{ horizon_lib_dir }}/openstack_dashboard/local/enabled/_2200_ironic.py"
     state: "{{ horizon_enable_ironic_ui | ternary('link', 'absent') }}"
   notify: Restart apache2
-  tags:
-    - horizon-configs
 
 - name: Enable the magnum-ui-dashboard Horizon panel
   file:
@@ -72,8 +68,6 @@
       path: "{{ horizon_lib_dir }}/openstack_dashboard/local/enabled/_1371_project_container_infra_clusters_panel.py"
     - src: "{{ horizon_lib_dir }}/magnum_ui/enabled/_1372_project_container_infra_cluster_templates_panel.py"
       path: "{{ horizon_lib_dir }}/openstack_dashboard/local/enabled/_1372_project_container_infra_cluster_templates_panel.py"
-  tags:
-    - horizon-configs
 
 - name: Enable the sahara-dashboard Horizon panel
   file:
@@ -88,8 +82,6 @@
       path: "{{ horizon_lib_dir }}/openstack_dashboard/enabled/_1820_data_processing_clusters_panel.py"
     - src: "{{ horizon_lib_dir }}/sahara_dashboard/enabled/_1840_data_processing_jobs_panel.py"
       path: "{{ horizon_lib_dir }}/openstack_dashboard/enabled/_1840_data_processing_jobs_panel.py"
-  tags:
-    - horizon-configs
 
 - name: Enable the trove-dashboard Horizon panel
   file:
@@ -110,8 +102,6 @@
       path: "{{ horizon_lib_dir }}/openstack_dashboard/enabled/_1740_project_database_clusters_panel.py"
     - src: "{{ horizon_lib_dir }}/trove_dashboard/enabled/_1760_project_database_configurations_panel.py"
       path: "{{ horizon_lib_dir }}/openstack_dashboard/enabled/_1760_project_database_configurations_panel.py"
-  tags:
-    - horizon-configs
 
 - name: Enable the neutron-lbaas-dashboard Horizon panel
   file:
@@ -167,8 +157,6 @@
   with_items:
     - horizon
     - openstack_dashboard
-  tags:
-    - horizon-configs
 
 - name: Collect and compress static files
   command: "{{ item }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 1b586895..dfc17237 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -34,13 +34,12 @@
 
 - include: horizon_post_install.yml
   tags:
-    - horizon-install
     - horizon-config
 
 - include: horizon_db_setup.yml
   when: inventory_hostname == groups['horizon_all'][0]
   tags:
-    - horizon-install
+    - horizon-config
 
 - include: horizon_ssl_self_signed.yml
   static: no
@@ -48,13 +47,12 @@
     - not horizon_external_ssl|bool
     - horizon_user_ssl_cert is not defined or horizon_user_ssl_key is not defined
   tags:
-    - horizon-install
+    - horizon-config
 
 - include: horizon_ssl_user_provided.yml
   static: no
   when: not horizon_external_ssl|bool
   tags:
-    - horizon-install
     - horizon-config
 
 - name: Update the ca certificates
@@ -63,15 +61,15 @@
    - not horizon_external_ssl|bool
    - ansible_pkg_mgr == 'apt'
   tags:
+    - horizon-config
     - horizon-ssl
 
 - include: horizon_service_setup.yml
   tags:
-    - horizon-install
+    - horizon-config
 
 - include: horizon_apache.yml
   tags:
-    - horizon-install
     - horizon-config
 
 - name: Flush handlers