diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index c9d3280736..7b96d044e6 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -431,7 +431,10 @@ outputs:
             - name: generate nodes-uuid data file
               copy:
                 dest: "{{playbook_dir}}/ceph-ansible/nodes_uuid_data.json"
-                content: {get_param: NodeDataLookup}
+                content:
+                  yaql:
+                    expression: dict($.data.keys().select($.toLower()).zip($.data.values()))
+                    data: {get_param: NodeDataLookup}
             - name: generate nodes-uuid playbook
               copy:
                 dest: "{{playbook_dir}}/ceph-ansible/nodes_uuid_playbook.yml"
@@ -443,7 +446,7 @@ outputs:
                         set_fact:
                           nodes_data: "{% raw %}{{ lookup('file','./nodes_uuid_data.json') | from_json  }}{% endraw %}"
                       - name: register machine id
-                        command: dmidecode -s system-uuid
+                        command: dmidecode -s system-uuid | tr A-F a-f
                         register: machine_uuid
                         # NOTE(tonyb): 0 == no error, 1 == -EPERM or bad data and 2 == Command not found
                         # 1 and 2 aren't great but shouldn't cause the deploy to fail.  If we're using