diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml
index 636f318c29..b915fc1389 100644
--- a/ci/environments/scenario000-standalone.yaml
+++ b/ci/environments/scenario000-standalone.yaml
@@ -184,8 +184,6 @@ resource_registry:
   OS::TripleO::Services::SaharaApi: OS::Heat::None
   OS::TripleO::Services::SaharaEngine: OS::Heat::None
   OS::TripleO::Services::Securetty: OS::Heat::None
-  OS::TripleO::Services::SkydiveAgent: OS::Heat::None
-  OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None
   OS::TripleO::Services::Snmp: OS::Heat::None
   OS::TripleO::Services::SwiftDispersion: OS::Heat::None
   OS::TripleO::Services::SwiftProxy: OS::Heat::None
diff --git a/deployment/skydive/skydive-agent-baremetal-ansible.yaml b/deployment/skydive/skydive-agent-baremetal-ansible.yaml
deleted file mode 100644
index 656403734b..0000000000
--- a/deployment/skydive/skydive-agent-baremetal-ansible.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-heat_template_version: rocky
-
-description: External tasks definition for Skydive
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-
-outputs:
-  role_data:
-    description: Role data for Skydive services.
-    # This service template essentially tags the nodes that we want
-    # as agents. The installation is performed in skydive-analyzer template.
-    value:
-      service_name: skydive_agent
-      upgrade_tasks: []
diff --git a/deployment/skydive/skydive-analyzer-baremetal-ansible.yaml b/deployment/skydive/skydive-analyzer-baremetal-ansible.yaml
deleted file mode 100644
index 14aa939ec0..0000000000
--- a/deployment/skydive/skydive-analyzer-baremetal-ansible.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-heat_template_version: rocky
-
-description: External tasks definition for Skydive
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  KeystoneRegion:
-    type: string
-    default: 'regionOne'
-    description: Keystone region for endpoint
-  EnableInternalTLS:
-    type: boolean
-    default: false
-  SkydiveAnsiblePlaybook:
-    type: string
-    description: Path to the skydive-ansible playbook to execute
-    default: /usr/share/skydive-ansible/playbook.yml.sample
-  SkydiveVars:
-    type: json
-    description: Variables used by skydive-ansible
-    default: {}
-  ContainerSkydiveAnalyzerImage:
-    description: Analyzer docker image
-    type: string
-  ContainerSkydiveAgentImage:
-    description: Agent docker image
-    type: string
-
-outputs:
-  role_data:
-    description: Role data for Skydive services.
-    value:
-      service_name: skydive_analyzer
-      firewall_rules:
-        '150 skydive_analyzer':
-          dport:
-            - 8082
-            - 12379
-            - 12380
-      upgrade_tasks: []
-      docker_config: {}
-      external_deploy_tasks:
-        - name: Skydive deployment
-          when: step|int == 5
-          block:
-            - name: create skydive temp dirs
-              become: true
-              file:
-                path: "{{item}}"
-                state: directory
-                owner: "{{ansible_user}}"
-              with_items:
-                - "{{playbook_dir}}/skydive"
-
-            - name: Skydive global vars fact
-              set_fact:
-                os_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
-                os_region_name: {get_param: KeystoneRegion}
-                skydive_ansible_playbook: {get_param: SkydiveAnsiblePlaybook}
-                skydive_analyzer_docker_image: {get_param: ContainerSkydiveAnalyzerImage}
-                skydive_agent_docker_image: {get_param: ContainerSkydiveAgentImage}
-                skydive_vars: {get_param: SkydiveVars}
-
-            - name: Skydive global defaults
-              copy:
-                dest: "{{playbook_dir}}/skydive/global_defaults.yml"
-                content: |
-                  skydive_docker_registry: {{skydive_analyzer_docker_image | regex_replace("([^/]*).*", "\1")}}
-                  skydive_analyzer_docker_image_tag: {{skydive_analyzer_docker_image | regex_replace(".*:")}}
-                  skydive_analyzer_docker_image: {{skydive_analyzer_docker_image | regex_replace("[^/]*/([^:]*).*", "\1")}}
-                  skydive_analyzer_docker_command: "/usr/bin/skydive analyzer --conf /etc/skydive.yml"
-                  skydive_agent_docker_image_tag: {{skydive_agent_docker_image | regex_replace(".*:")}}
-                  skydive_agent_docker_image: {{skydive_agent_docker_image | regex_replace("[^/]*/([^:]*).*", "\1")}}
-                  skydive_agent_docker_command: "/usr/bin/skydive agent --conf /etc/skydive.yml"
-                  os_auth_url: {{overcloud_keystone_url}}/v3
-                  os_username: {{username}}
-                  os_password: {{overcloud_admin_password}}
-                  os_tenant_name: {{project_name}}
-                  skydive_auth_type: keystone
-                  skydive_os_auth_url: {{os_auth_url}}/v3
-                  skydive_os_service_region_name: {{os_region_name}}
-                  skydive_deployment_mode: container
-                  skydive_deployment_source: tripleo
-                  skydive_flow_protocol: websocket
-                  skydive_topology_probes:
-                    - neutron
-                    - ovsdb
-                    - runc
-
-            - name: generate Skydive global vars
-              copy:
-                dest: "{{playbook_dir}}/skydive/global_vars.yml"
-                content: "{{skydive_vars.globals|default({})|to_nice_yaml}}"
-
-            - name: generate inventory
-              copy:
-                dest: "{{playbook_dir}}/skydive/inventory.yml"
-                content: |
-                  analyzers:
-                    hosts:
-                      {% for host in groups['skydive_analyzer'] -%}
-                      {{hostvars.raw_get(host)['ansible_hostname']}}:
-                        ansible_user: {{ hostvars.raw_get(host)['ansible_user'] | default(hostvars.raw_get(host)['ansible_ssh_user']) | default('root') }}
-                        ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) }}
-                        ansible_become: true
-                        skydive_listen_ip: {{hostvars.raw_get(host)['ctlplane_ip']}}
-                        {% if skydive_vars.analyzers is defined -%}
-                        {{skydive_vars.analyzers|to_nice_yaml(indent=6)}}
-                        {%- endif %}
-
-                      {% endfor %}
-
-                  agents:
-                    hosts:
-                      {% for host in groups['skydive_agent'] -%}
-                      {{hostvars.raw_get(host)['ansible_hostname']}}:
-                        ansible_user: {{ hostvars.raw_get(host)['ansible_user'] | default(hostvars.raw_get(host)['ansible_ssh_user']) | default('root') }}
-                        ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) }}
-                        ansible_become: true
-                        skydive_listen_ip: {{hostvars.raw_get(host)['ctlplane_ip']}}
-                        {% if skydive_vars.agents is defined -%}
-                        {{skydive_vars.agents|to_nice_yaml(indent=6)}}
-                        {%- endif %}
-
-                      {% endfor %}
-
-            - name: write Skydive deploy script
-              copy:
-                content: >
-                  #!/bin/bash
-
-                  set -e
-
-                  ANSIBLE_CONFIG="{{playbook_dir}}/ansible.cfg"
-                  ANSIBLE_HOST_KEY_CHECKING=False
-                  ansible-playbook
-                  {% if ansible_ssh_private_key_file is defined %}--private-key '{{ansible_ssh_private_key_file}}'{% endif %}
-                  -i '{{playbook_dir}}/skydive/inventory.yml'
-                  --extra-vars '@{{playbook_dir}}/skydive/global_defaults.yml'
-                  --extra-vars '@{{playbook_dir}}/skydive/global_vars.yml'
-                  '{{skydive_ansible_playbook}}'
-                dest: '{{playbook_dir}}/skydive/skydive-deploy.sh'
-                mode: 0700
-
-            - name: run skydive-deploy.sh (immediate log at {{playbook_dir}}/skydive/playbook.log)
-              become: true
-              shell: |
-                {{playbook_dir}}/skydive/skydive-deploy.sh 2>&1 | tee {{playbook_dir}}/skydive/playbook.log
-                exit ${PIPESTATUS[0]}
diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml
index 73a9d20844..ed69a0351b 100644
--- a/environments/hyperconverged-ceph.yaml
+++ b/environments/hyperconverged-ceph.yaml
@@ -42,7 +42,6 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoPackages
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::Tuned
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::IpaClient
     - OS::TripleO::Services::Ipsec
     - OS::TripleO::Services::AuditD
diff --git a/environments/services/skydive-environment.yaml b/environments/services/skydive-environment.yaml
deleted file mode 100644
index 156ca26101..0000000000
--- a/environments/services/skydive-environment.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-resource_registry:
-  OS::TripleO::Services::SkydiveAnalyzer: ../../deployment/skydive/skydive-analyzer-baremetal-ansible.yaml
-  OS::TripleO::Services::SkydiveAgent: ../../deployment/skydive/skydive-agent-baremetal-ansible.yaml
-
-#parameter_defaults:
-#  SkydiveVars:
-#    globals:
-#      skydive_listen_ip: 0.0.0.0
-#    analyzers:
-#      skydive_analyzer_docker_command: "analyzer"
-#    agents:
-#      skydive_analyzer_docker_command: "agent"
diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml
index 6ca2c1aea1..bf944448e1 100644
--- a/environments/undercloud/undercloud-minion.yaml
+++ b/environments/undercloud/undercloud-minion.yaml
@@ -209,8 +209,6 @@ resource_registry:
   OS::TripleO::Services::SaharaApi: OS::Heat::None
   OS::TripleO::Services::SaharaEngine: OS::Heat::None
   OS::TripleO::Services::Securetty: OS::Heat::None
-  OS::TripleO::Services::SkydiveAgent: OS::Heat::None
-  OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None
   OS::TripleO::Services::Snmp: OS::Heat::None
   OS::TripleO::Services::SwiftDispersion: OS::Heat::None
   OS::TripleO::Services::SwiftProxy: OS::Heat::None
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 2455b76558..5a7a95a00e 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -305,8 +305,6 @@ resource_registry:
   OS::TripleO::Services::Rsyslog: OS::Heat::None
   OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
   OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
-  OS::TripleO::Services::SkydiveAgent: OS::Heat::None
-  OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None
   OS::TripleO::Services::LoginDefs: OS::Heat::None
   OS::TripleO::Services::ComputeInstanceHA: OS::Heat::None
   OS::TripleO::Services::DesignateApi: OS::Heat::None
diff --git a/roles/CellController.yaml b/roles/CellController.yaml
index 1e20d97e9e..517ea69053 100644
--- a/roles/CellController.yaml
+++ b/roles/CellController.yaml
@@ -53,7 +53,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/Compute.yaml b/roles/Compute.yaml
index 09883dc9d4..68e2b160ff 100644
--- a/roles/Compute.yaml
+++ b/roles/Compute.yaml
@@ -69,7 +69,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml
index 3a0f47fd45..435dadda17 100644
--- a/roles/ComputeAlt.yaml
+++ b/roles/ComputeAlt.yaml
@@ -44,7 +44,6 @@
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml
index 39dc38bbca..c5b7f5c9b4 100644
--- a/roles/ComputeDVR.yaml
+++ b/roles/ComputeDVR.yaml
@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml
index 50a3a9ebd0..c3fbacacc4 100644
--- a/roles/ComputeHCI.yaml
+++ b/roles/ComputeHCI.yaml
@@ -56,7 +56,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeHCIOvsDpdk.yaml b/roles/ComputeHCIOvsDpdk.yaml
index 1e175b37ca..37277c3d95 100644
--- a/roles/ComputeHCIOvsDpdk.yaml
+++ b/roles/ComputeHCIOvsDpdk.yaml
@@ -58,7 +58,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeHCISriov.yaml b/roles/ComputeHCISriov.yaml
index dd3a976365..a330316180 100644
--- a/roles/ComputeHCISriov.yaml
+++ b/roles/ComputeHCISriov.yaml
@@ -53,7 +53,6 @@
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timezone
diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml
index 72918043c3..d13540691c 100644
--- a/roles/ComputeInstanceHA.yaml
+++ b/roles/ComputeInstanceHA.yaml
@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml
index 2de94ba5eb..a995551be1 100644
--- a/roles/ComputeLiquidio.yaml
+++ b/roles/ComputeLiquidio.yaml
@@ -56,7 +56,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeLocalEphemeral.yaml b/roles/ComputeLocalEphemeral.yaml
index ffeb2f0cb7..b37c393bf3 100644
--- a/roles/ComputeLocalEphemeral.yaml
+++ b/roles/ComputeLocalEphemeral.yaml
@@ -58,7 +58,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml
index 5a6781d743..ae824874e7 100644
--- a/roles/ComputeOvsDpdk.yaml
+++ b/roles/ComputeOvsDpdk.yaml
@@ -58,7 +58,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml
index 3e6e95cb14..b97258c62e 100644
--- a/roles/ComputeOvsDpdkRT.yaml
+++ b/roles/ComputeOvsDpdkRT.yaml
@@ -59,7 +59,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeOvsDpdkSriov.yaml b/roles/ComputeOvsDpdkSriov.yaml
index 71a8e45902..d1971fc1ba 100644
--- a/roles/ComputeOvsDpdkSriov.yaml
+++ b/roles/ComputeOvsDpdkSriov.yaml
@@ -54,7 +54,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml
index afedc2346a..bcdeaa2bdd 100644
--- a/roles/ComputeOvsDpdkSriovRT.yaml
+++ b/roles/ComputeOvsDpdkSriovRT.yaml
@@ -56,7 +56,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml
index cf5f3c6e96..854da76d78 100644
--- a/roles/ComputePPC64LE.yaml
+++ b/roles/ComputePPC64LE.yaml
@@ -55,7 +55,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeRBDEphemeral.yaml b/roles/ComputeRBDEphemeral.yaml
index 00827b7916..d36f3e903d 100644
--- a/roles/ComputeRBDEphemeral.yaml
+++ b/roles/ComputeRBDEphemeral.yaml
@@ -58,7 +58,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml
index 8f66d57fa7..0fc97259d5 100644
--- a/roles/ComputeRealTime.yaml
+++ b/roles/ComputeRealTime.yaml
@@ -64,7 +64,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml
index 390b6f6a4d..232d83e828 100644
--- a/roles/ComputeSriov.yaml
+++ b/roles/ComputeSriov.yaml
@@ -54,7 +54,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeSriovIB.yaml b/roles/ComputeSriovIB.yaml
index 24233b0a07..a2804766d3 100644
--- a/roles/ComputeSriovIB.yaml
+++ b/roles/ComputeSriovIB.yaml
@@ -53,7 +53,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml
index 47bcf0f491..4c57aafdf0 100644
--- a/roles/ComputeSriovRT.yaml
+++ b/roles/ComputeSriovRT.yaml
@@ -56,7 +56,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/Controller.yaml b/roles/Controller.yaml
index 86bfb72f90..f454227b6b 100644
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@@ -167,8 +167,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml
index be744a6672..736663a230 100644
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/roles/ControllerAllNovaStandalone.yaml
@@ -114,8 +114,6 @@
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml
index 98644e02cb..2cb52fdeac 100644
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.yaml
@@ -159,8 +159,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml
index 5c2d61db0b..ed31ddfb30 100644
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@@ -135,8 +135,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml
index ce98024950..41f9915c63 100644
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@@ -127,8 +127,6 @@
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml
index a1f8b1b983..e1cc964357 100644
--- a/roles/ControllerStorageDashboard.yaml
+++ b/roles/ControllerStorageDashboard.yaml
@@ -168,8 +168,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml
index 0992c8f5fc..179fffb009 100644
--- a/roles/ControllerStorageNfs.yaml
+++ b/roles/ControllerStorageNfs.yaml
@@ -169,8 +169,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml
index a80c28c1bd..e6731add46 100644
--- a/roles/DistributedCompute.yaml
+++ b/roles/DistributedCompute.yaml
@@ -54,7 +54,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml
index e32e3e8519..b861563583 100644
--- a/roles/DistributedComputeHCI.yaml
+++ b/roles/DistributedComputeHCI.yaml
@@ -63,7 +63,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/DistributedComputeHCIScaleOut.yaml b/roles/DistributedComputeHCIScaleOut.yaml
index 069c6e074b..d9c7b7983d 100644
--- a/roles/DistributedComputeHCIScaleOut.yaml
+++ b/roles/DistributedComputeHCIScaleOut.yaml
@@ -57,7 +57,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/DistributedComputeScaleOut.yaml b/roles/DistributedComputeScaleOut.yaml
index c0be2c1286..fb2901935c 100644
--- a/roles/DistributedComputeScaleOut.yaml
+++ b/roles/DistributedComputeScaleOut.yaml
@@ -54,7 +54,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml
index c86a17450b..cfc40c703d 100644
--- a/roles/HciCephAll.yaml
+++ b/roles/HciCephAll.yaml
@@ -63,7 +63,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml
index afaad3ead2..4e6460b8e0 100644
--- a/roles/HciCephFile.yaml
+++ b/roles/HciCephFile.yaml
@@ -58,7 +58,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml
index 19cf3c9b9c..f0a06b1761 100644
--- a/roles/HciCephMon.yaml
+++ b/roles/HciCephMon.yaml
@@ -59,7 +59,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml
index 08d595d66d..5f394ca8aa 100644
--- a/roles/HciCephObject.yaml
+++ b/roles/HciCephObject.yaml
@@ -58,7 +58,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/Networker.yaml b/roles/Networker.yaml
index 7053ad2491..73ebfa34a9 100644
--- a/roles/Networker.yaml
+++ b/roles/Networker.yaml
@@ -45,7 +45,6 @@
     - OS::TripleO::Services::Podman
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml
index c1e14ecef4..ef2f640d8f 100644
--- a/roles/Novacontrol.yaml
+++ b/roles/Novacontrol.yaml
@@ -35,7 +35,6 @@
     - OS::TripleO::Services::Rhsm
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml
index e127e4e4dd..5ee68ad0ef 100644
--- a/roles/Standalone.yaml
+++ b/roles/Standalone.yaml
@@ -166,8 +166,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftDispersion
diff --git a/roles_data.yaml b/roles_data.yaml
index 48cf8c969f..ba2520a764 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -170,8 +170,6 @@
     - OS::TripleO::Services::SaharaApi
     - OS::TripleO::Services::SaharaEngine
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
-    - OS::TripleO::Services::SkydiveAnalyzer
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::SwiftProxy
@@ -256,7 +254,6 @@
     - OS::TripleO::Services::Rsyslog
     - OS::TripleO::Services::RsyslogSidecar
     - OS::TripleO::Services::Securetty
-    - OS::TripleO::Services::SkydiveAgent
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timesync
diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml
index 6c5aca4364..0eb69ab776 100644
--- a/sample-env-generator/undercloud-minion.yaml
+++ b/sample-env-generator/undercloud-minion.yaml
@@ -231,8 +231,6 @@ environments:
       OS::TripleO::Services::SaharaEngine: OS::Heat::None
       OS::TripleO::Services::Securetty: OS::Heat::None
       OS::TripleO::Services::SELinux: OS::Heat::None
-      OS::TripleO::Services::SkydiveAgent: OS::Heat::None
-      OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None
       OS::TripleO::Services::Snmp: OS::Heat::None
       OS::TripleO::Services::SwiftDispersion: OS::Heat::None
       OS::TripleO::Services::SwiftProxy: OS::Heat::None
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 9e6da7e568..5b53d30633 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -286,9 +286,6 @@ WORKFLOW_TASKS_EXCLUSIONS = [
     './deployment/ceph-ansible/ceph-base.yaml',
     './deployment/ceph-ansible/ceph-mon.yaml',
     './deployment/ceph-ansible/ceph-mgr.yaml',
-    './docker/services/skydive/skydive-base.yaml',
-    './docker/services/skydive/skydive-agent.yaml',
-    './docker/services/skydive/skydive-analyzer.yaml',
 ]