diff --git a/library/keystone_sp b/library/keystone_sp
index 71417328..622511e6 100644
--- a/library/keystone_sp
+++ b/library/keystone_sp
@@ -82,7 +82,7 @@ class KeystoneSp(object):
         self.protocols_return_list = list()
         self.sp_data = self.module.params['sp_data']
         if isinstance(self.sp_data, str):
-            self.sp_data = json.loads(self.sp_data.replace("'", '"'))
+            self.sp_data = json.loads(self.sp_data)
 
     def populate_sp_data(self):
         trusted_idp_list = self.sp_data['trusted_idp_list']
diff --git a/tasks/keystone_federation_sp_idp_setup.yml b/tasks/keystone_federation_sp_idp_setup.yml
index c66d393f..4ed6f6dd 100644
--- a/tasks/keystone_federation_sp_idp_setup.yml
+++ b/tasks/keystone_federation_sp_idp_setup.yml
@@ -20,7 +20,7 @@
 # User with_subelements instead, but in v1.x it's broken
 - name: Set keystone_federated_identities fact
   keystone_sp:
-    sp_data: "{{ keystone_sp }}"
+    sp_data: "{{ keystone_sp | to_json }}"
 
 - name: Ensure domain which remote IDP users are mapped onto exists
   keystone: