diff --git a/extraconfig/services/skydive-analyzer.yaml b/extraconfig/services/skydive-analyzer.yaml
index 20e92e4eb0..27303a6ea2 100644
--- a/extraconfig/services/skydive-analyzer.yaml
+++ b/extraconfig/services/skydive-analyzer.yaml
@@ -94,9 +94,10 @@ outputs:
                 dest: "{{playbook_dir}}/skydive/global_defaults.yml"
                 content: |
                   skydive_docker_registry: {{skydive_analyzer_docker_image | regex_replace("([^/]*).*", "\1")}}
-                  skydive_docker_image_tag: {{skydive_analyzer_docker_image | regex_replace(".*:")}}
+                  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