diff --git a/api-ref/src/wadls/compute-api/src/ext/os-cloudpipe.wadl b/api-ref/src/wadls/compute-api/src/ext/os-cloudpipe.wadl
index 1c6dee16e..e5a44e4c6 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-cloudpipe.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-cloudpipe.wadl
@@ -29,7 +29,12 @@
         <response status="200">
             <representation mediaType="application/json">
                 <doc xml:lang="EN">
-                    <xsdxt:code href="samples/os-cloudpipe-list-response.json" />
+                    <xsdxt:code href="../api_samples/os-cloudpipe/cloud-pipe-get-resp.json" />
+                </doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <doc xml:lang="EN">
+                    <xsdxt:code href="../api_samples/os-cloudpipe/cloud-pipe-get-resp.xml" />
                 </doc>
             </representation>
         </response>
@@ -47,14 +52,24 @@
                     </p></doc>
                 </param>
                 <doc xml:lang="EN">
-                    <xsdxt:code href="samples/os-cloudpipe-create-request.json" />
+                    <xsdxt:code href="../api_samples/os-cloudpipe/cloud-pipe-create-req.json" />
+                </doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <doc xml:lang="EN">
+                    <xsdxt:code href="../api_samples/os-cloudpipe/cloud-pipe-create-req.xml" />
                 </doc>
             </representation>
         </request>
         <response status="200">
             <representation mediaType="application/json">
                 <doc xml:lang="EN">
-                    <xsdxt:code href="samples/os-cloudpipe-create-response.json" />
+                    <xsdxt:code href="../api_samples/os-cloudpipe/cloud-pipe-create-resp.json" />
+                </doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <doc xml:lang="EN">
+                    <xsdxt:code href="../api_samples/os-cloudpipe/cloud-pipe-create-resp.xml" />
                 </doc>
             </representation>
         </response>
diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-create-request.json b/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-create-request.json
deleted file mode 100644
index 690e6ab05..000000000
--- a/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-create-request.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "cloudpipe": {
-        "project_id": "b7f6d49c12714e96a05fada4aba4ead6"
-    }
-}
diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-create-response.json b/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-create-response.json
deleted file mode 100644
index 6877bed47..000000000
--- a/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-create-response.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "instance_id": "8250f384-ee8a-43b7-9eb2-453e5bbdd019"
-}
diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-list-response.json b/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-list-response.json
deleted file mode 100644
index f653ae6ba..000000000
--- a/api-ref/src/wadls/compute-api/src/ext/samples/os-cloudpipe-list-response.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "cloudpipes": [
-        {
-            "project_id": "b7f6d49c12714e96a05fada4aba4ead6",
-            "internal_ip": "10.0.0.2",
-            "public_ip": "192.168.1.100",
-            "public_port": 8000,
-            "state": "running",
-            "instance_id": "8250f384-ee8a-43b7-9eb2-453e5bbdd019",
-            "created_at": "1981-10-20T00:00:00Z"
-        },
-        {
-            "project_id": "98626b18f01c442f99bc11f27b9cc2d2",
-            "internal_ip": "10.0.1.2",
-            "public_ip": "192.168.1.100",
-            "public_port": 8001,
-            "state": "running",
-            "instance_id": "af7439ee-5582-4457-acf3-656d013eecb8",
-            "created_at": "1981-10-20T00:00:00Z"
-        }
-    ]
-}