diff --git a/api-ref/regenerate-samples.sh b/api-ref/regenerate-samples.sh
index b17807740d..6196886aaf 100755
--- a/api-ref/regenerate-samples.sh
+++ b/api-ref/regenerate-samples.sh
@@ -18,7 +18,11 @@ export OS_AUTH_TOKEN IRONIC_URL
 DOC_CHASSIS_UUID="dff29d23-1ded-43b4-8ae1-5eebb3e30de1"
 DOC_NODE_UUID="6d85703a-565d-469a-96ce-30b6de53079d"
 DOC_PORT_UUID="d2b30520-907d-46c8-bfee-c5586e6fb3a1"
-DOC_PORTGROUP_UUID="e059deab-6e86-40d1-9e70-62d525f16728"
+DOC_PORTGROUP_UUID="e43c722c-248e-4c6e-8ce8-0d8ff129387a"
+DOC_PROVISION_UPDATED_AT="2016-08-18T22:28:49.946416+00:00"
+DOC_CREATED_AT="2016-08-18T22:28:48.643434+11:11"
+DOC_UPDATED_AT="2016-08-18T22:28:49.653974+00:00"
+DOC_IRONIC_CONDUCTOR_HOSTNAME="897ab1dad809"
 
 function GET {
     # GET $RESOURCE
@@ -54,6 +58,27 @@ function PUT {
             ${IRONIC_URL}/$1
 }
 
+function wait_for_node_state {
+    local node="$1"
+    local field="$2"
+    local target_state="$3"
+    local attempt=10
+
+    while [[ $attempt -gt 0 ]]; do
+        res=$(openstack baremetal node show "$node" -f value -c "$field")
+        if [[ "$res" == "$target_state" ]]; then
+            break
+        fi
+        sleep 1
+        attempt=$((attempt - 1))
+        echo "Failed to get node $field == $target_state in $attempt attempts."
+    done
+
+    if [[ $attempt == 0 ]]; then
+        exit 1
+    fi
+}
+
 pushd source/samples
 
 ###########
@@ -116,10 +141,14 @@ GET v1/nodes/$NID/vendor_passthru/methods > node-vendor-passthru-response.json
 PATCH v1/nodes/$NID node-update-driver.json
 PUT v1/nodes/$NID/states/provision node-set-manage-state.json
 PUT v1/nodes/$NID/states/provision node-set-available-state.json
+# Wait node to become available
+wait_for_node_state $NID provision_state available
 
 GET v1/nodes/$NID/validate > node-validate-response.json
 
 PUT v1/nodes/$NID/states/power node-set-power-off.json
+# Wait node to reach power off state
+wait_for_node_state $NID power_state "power off"
 GET v1/nodes/$NID/states > node-get-state-response.json
 
 GET v1/nodes > nodes-list-response.json
@@ -216,3 +245,7 @@ sed -i "s/$CID/$DOC_CHASSIS_UUID/" *.json
 sed -i "s/$NID/$DOC_NODE_UUID/" *.json
 sed -i "s/$PID/$DOC_PORT_UUID/" *.json
 sed -i "s/$PGID/$DOC_PORTGROUP_UUID/" *.json
+sed -i "s/$(hostname)/$DOC_IRONIC_CONDUCTOR_HOSTNAME/" *.json
+sed -i "s/created_at\": \".*\"/created_at\": \"$DOC_CREATED_AT\"/" *.json
+sed -i "s/updated_at\": \".*\"/updated_at\": \"$DOC_UPDATED_AT\"/" *.json
+sed -i "s/provision_updated_at\": \".*\"/provision_updated_at\": \"$DOC_PROVISION_UPDATED_AT\"/" *.json
diff --git a/api-ref/source/samples/chassis-list-details-response.json b/api-ref/source/samples/chassis-list-details-response.json
index f9aac021e2..770d5ad3a1 100644
--- a/api-ref/source/samples/chassis-list-details-response.json
+++ b/api-ref/source/samples/chassis-list-details-response.json
@@ -1,7 +1,7 @@
 {
   "chassis": [
     {
-      "created_at": "2016-08-18T22:28:48.165105+00:00",
+      "created_at": "2016-08-18T22:28:48.643434+11:11",
       "description": "Sample chassis",
       "extra": {},
       "links": [
diff --git a/api-ref/source/samples/chassis-show-response.json b/api-ref/source/samples/chassis-show-response.json
index c2f8c6f420..bfc6200c14 100644
--- a/api-ref/source/samples/chassis-show-response.json
+++ b/api-ref/source/samples/chassis-show-response.json
@@ -1,5 +1,5 @@
 {
-  "created_at": "2016-08-18T22:28:48.165105+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "description": "Sample chassis",
   "extra": {},
   "links": [
diff --git a/api-ref/source/samples/chassis-update-response.json b/api-ref/source/samples/chassis-update-response.json
index 7e7279c9f9..627243a360 100644
--- a/api-ref/source/samples/chassis-update-response.json
+++ b/api-ref/source/samples/chassis-update-response.json
@@ -1,5 +1,5 @@
 {
-  "created_at": "2016-08-18T22:28:48.165105+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "description": "Updated Chassis",
   "extra": {},
   "links": [
@@ -22,6 +22,6 @@
       "rel": "bookmark"
     }
   ],
-  "updated_at": "2016-08-18T22:28:48.556556+00:00",
+  "updated_at": "2016-08-18T22:28:49.653974+00:00",
   "uuid": "dff29d23-1ded-43b4-8ae1-5eebb3e30de1"
 }
diff --git a/api-ref/source/samples/node-create-response.json b/api-ref/source/samples/node-create-response.json
index 3c0a166845..8f6e8ec1ef 100644
--- a/api-ref/source/samples/node-create-response.json
+++ b/api-ref/source/samples/node-create-response.json
@@ -1,7 +1,8 @@
 {
+  "chassis_uuid": null,
   "clean_step": {},
   "console_enabled": false,
-  "created_at": "2016-08-18T22:28:48.643434+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "driver": "agent_ipmitool",
   "driver_info": {
     "ipmi_password": "******",
diff --git a/api-ref/source/samples/node-get-state-response.json b/api-ref/source/samples/node-get-state-response.json
index 67b25fe757..009552bebf 100644
--- a/api-ref/source/samples/node-get-state-response.json
+++ b/api-ref/source/samples/node-get-state-response.json
@@ -3,7 +3,7 @@
   "last_error": null,
   "power_state": "power off",
   "provision_state": "available",
-  "provision_updated_at": "2016-08-18T22:28:49.382814+00:00",
+  "provision_updated_at": "2016-08-18T22:28:49.946416+00:00",
   "raid_config": {},
   "target_power_state": null,
   "target_provision_state": null,
diff --git a/api-ref/source/samples/node-port-detail-response.json b/api-ref/source/samples/node-port-detail-response.json
index 393e9e4769..1e5ea3405b 100644
--- a/api-ref/source/samples/node-port-detail-response.json
+++ b/api-ref/source/samples/node-port-detail-response.json
@@ -2,7 +2,7 @@
   "ports": [
     {
       "address": "22:22:22:22:22:22",
-      "created_at": "2016-08-18T22:28:49.946416+00:00",
+      "created_at": "2016-08-18T22:28:48.643434+11:11",
       "extra": {},
       "internal_info": {},
       "links": [
@@ -23,7 +23,7 @@
       "node_uuid": "6d85703a-565d-469a-96ce-30b6de53079d",
       "portgroup_uuid": "e43c722c-248e-4c6e-8ce8-0d8ff129387a",
       "pxe_enabled": true,
-      "updated_at": "2016-08-18T22:28:50.148137+00:00",
+      "updated_at": "2016-08-18T22:28:49.653974+00:00",
       "uuid": "d2b30520-907d-46c8-bfee-c5586e6fb3a1"
     }
   ]
diff --git a/api-ref/source/samples/node-portgroup-detail-response.json b/api-ref/source/samples/node-portgroup-detail-response.json
index 739c3fe904..c1a6862495 100644
--- a/api-ref/source/samples/node-portgroup-detail-response.json
+++ b/api-ref/source/samples/node-portgroup-detail-response.json
@@ -2,7 +2,7 @@
   "portgroups": [
     {
       "address": "22:22:22:22:22:22",
-      "created_at": "2016-08-18T22:28:48.165105+00:00",
+      "created_at": "2016-08-18T22:28:48.643434+11:11",
       "extra": {},
       "internal_info": {},
       "links": [
@@ -30,7 +30,7 @@
       ],
       "properties": {},
       "standalone_ports_supported": true,
-      "updated_at": "2016-11-04T17:46:09+00:00",
+      "updated_at": "2016-08-18T22:28:49.653974+00:00",
       "uuid": "e43c722c-248e-4c6e-8ce8-0d8ff129387a"
     }
   ]
diff --git a/api-ref/source/samples/node-set-power-state.json b/api-ref/source/samples/node-set-power-state.json
deleted file mode 100644
index 11833351b0..0000000000
--- a/api-ref/source/samples/node-set-power-state.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "target": "power on"
-}
\ No newline at end of file
diff --git a/api-ref/source/samples/node-show-response.json b/api-ref/source/samples/node-show-response.json
index 2c62d77d1d..f6d71c039c 100644
--- a/api-ref/source/samples/node-show-response.json
+++ b/api-ref/source/samples/node-show-response.json
@@ -1,7 +1,8 @@
 {
+  "chassis_uuid": null,
   "clean_step": {},
   "console_enabled": false,
-  "created_at": "2016-08-18T22:28:48.643434+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "driver": "fake",
   "driver_info": {
     "ipmi_password": "******",
@@ -53,7 +54,7 @@
   "power_state": "power off",
   "properties": {},
   "provision_state": "available",
-  "provision_updated_at": "2016-08-18T22:28:49.382814+00:00",
+  "provision_updated_at": "2016-08-18T22:28:49.946416+00:00",
   "raid_config": {},
   "reservation": null,
   "resource_class": null,
diff --git a/api-ref/source/samples/node-states-show-response.json b/api-ref/source/samples/node-states-show-response.json
deleted file mode 100644
index fd9a40da58..0000000000
--- a/api-ref/source/samples/node-states-show-response.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "console_enabled": false,
-    "last_error": null,
-    "power_state": "power on",
-    "provision_state": null,
-    "provision_updated_at": null,
-    "raid_config": null,
-    "target_power_state": "power on",
-    "target_provision_state": "active",
-    "target_raid_config": null
-}
diff --git a/api-ref/source/samples/node-update-driver-info-response.json b/api-ref/source/samples/node-update-driver-info-response.json
index 1366503dc8..37d78ea82d 100644
--- a/api-ref/source/samples/node-update-driver-info-response.json
+++ b/api-ref/source/samples/node-update-driver-info-response.json
@@ -1,7 +1,8 @@
 {
+  "chassis_uuid": null,
   "clean_step": {},
   "console_enabled": false,
-  "created_at": "2016-08-18T22:28:48+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "driver": "fake",
   "driver_info": {
     "deploy_kernel": "http://127.0.0.1/images/kernel",
@@ -55,7 +56,7 @@
   "power_state": "power off",
   "properties": {},
   "provision_state": "available",
-  "provision_updated_at": "2016-08-18T22:28:49+00:00",
+  "provision_updated_at": "2016-08-18T22:28:49.946416+00:00",
   "raid_config": {},
   "reservation": null,
   "resource_class": null,
@@ -72,6 +73,6 @@
   "target_power_state": null,
   "target_provision_state": null,
   "target_raid_config": {},
-  "updated_at": "2016-08-18T22:28:50+00:00",
+  "updated_at": "2016-08-18T22:28:49.653974+00:00",
   "uuid": "6d85703a-565d-469a-96ce-30b6de53079d"
 }
diff --git a/api-ref/source/samples/nodes-list-details-response.json b/api-ref/source/samples/nodes-list-details-response.json
index 115396e2fb..7b29c4ebde 100644
--- a/api-ref/source/samples/nodes-list-details-response.json
+++ b/api-ref/source/samples/nodes-list-details-response.json
@@ -1,9 +1,10 @@
 {
   "nodes": [
     {
+      "chassis_uuid": null,
       "clean_step": {},
       "console_enabled": false,
-      "created_at": "2016-08-18T22:28:48.643434+00:00",
+      "created_at": "2016-08-18T22:28:48.643434+11:11",
       "driver": "fake",
       "driver_info": {
         "ipmi_password": "******",
@@ -55,7 +56,7 @@
       "power_state": "power off",
       "properties": {},
       "provision_state": "available",
-      "provision_updated_at": "2016-08-18T22:28:49.382814+00:00",
+      "provision_updated_at": "2016-08-18T22:28:49.946416+00:00",
       "raid_config": {},
       "reservation": null,
       "resource_class": null,
diff --git a/api-ref/source/samples/port-create-response.json b/api-ref/source/samples/port-create-response.json
index ab3a792065..f527ec79e6 100644
--- a/api-ref/source/samples/port-create-response.json
+++ b/api-ref/source/samples/port-create-response.json
@@ -1,6 +1,6 @@
 {
   "address": "11:11:11:11:11:11",
-  "created_at": "2016-08-18T22:28:49.946416+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "extra": {},
   "internal_info": {},
   "links": [
diff --git a/api-ref/source/samples/port-list-detail-response.json b/api-ref/source/samples/port-list-detail-response.json
index 40804ca193..08c421d504 100644
--- a/api-ref/source/samples/port-list-detail-response.json
+++ b/api-ref/source/samples/port-list-detail-response.json
@@ -2,7 +2,7 @@
   "ports": [
     {
       "address": "11:11:11:11:11:11",
-      "created_at": "2016-08-18T22:28:49.946416+00:00",
+      "created_at": "2016-08-18T22:28:48.643434+11:11",
       "extra": {},
       "internal_info": {},
       "links": [
diff --git a/api-ref/source/samples/port-update-response.json b/api-ref/source/samples/port-update-response.json
index d80681253b..49d9e0517f 100644
--- a/api-ref/source/samples/port-update-response.json
+++ b/api-ref/source/samples/port-update-response.json
@@ -1,6 +1,6 @@
 {
   "address": "22:22:22:22:22:22",
-  "created_at": "2016-08-18T22:28:49+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "extra": {},
   "internal_info": {},
   "links": [
@@ -21,6 +21,6 @@
   "node_uuid": "6d85703a-565d-469a-96ce-30b6de53079d",
   "portgroup_uuid": "e43c722c-248e-4c6e-8ce8-0d8ff129387a",
   "pxe_enabled": true,
-  "updated_at": "2016-08-18T22:28:50+00:00",
+  "updated_at": "2016-08-18T22:28:49.653974+00:00",
   "uuid": "d2b30520-907d-46c8-bfee-c5586e6fb3a1"
 }
diff --git a/api-ref/source/samples/portgroup-create-response.json b/api-ref/source/samples/portgroup-create-response.json
index b52e988fce..35e58e3d37 100644
--- a/api-ref/source/samples/portgroup-create-response.json
+++ b/api-ref/source/samples/portgroup-create-response.json
@@ -1,6 +1,6 @@
 {
   "address": "11:11:11:11:11:11",
-  "created_at": "2016-08-18T22:28:48.165105+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "extra": {},
   "internal_info": {},
   "links": [
diff --git a/api-ref/source/samples/portgroup-list-detail-response.json b/api-ref/source/samples/portgroup-list-detail-response.json
index 48ade4c713..90789fc5e7 100644
--- a/api-ref/source/samples/portgroup-list-detail-response.json
+++ b/api-ref/source/samples/portgroup-list-detail-response.json
@@ -2,7 +2,7 @@
   "portgroups": [
     {
       "address": "11:11:11:11:11:11",
-      "created_at": "2016-08-18T22:28:48.165105+00:00",
+      "created_at": "2016-08-18T22:28:48.643434+11:11",
       "extra": {},
       "internal_info": {},
       "links": [
diff --git a/api-ref/source/samples/portgroup-port-detail-response.json b/api-ref/source/samples/portgroup-port-detail-response.json
index 1aadd0af54..1e5ea3405b 100644
--- a/api-ref/source/samples/portgroup-port-detail-response.json
+++ b/api-ref/source/samples/portgroup-port-detail-response.json
@@ -2,7 +2,7 @@
   "ports": [
     {
       "address": "22:22:22:22:22:22",
-      "created_at": "2016-08-18T22:28:48.165105+00:00",
+      "created_at": "2016-08-18T22:28:48.643434+11:11",
       "extra": {},
       "internal_info": {},
       "links": [
@@ -23,7 +23,7 @@
       "node_uuid": "6d85703a-565d-469a-96ce-30b6de53079d",
       "portgroup_uuid": "e43c722c-248e-4c6e-8ce8-0d8ff129387a",
       "pxe_enabled": true,
-      "updated_at": "2016-11-04T17:46:09+00:00",
+      "updated_at": "2016-08-18T22:28:49.653974+00:00",
       "uuid": "d2b30520-907d-46c8-bfee-c5586e6fb3a1"
     }
   ]
diff --git a/api-ref/source/samples/portgroup-update-response.json b/api-ref/source/samples/portgroup-update-response.json
index eeb488bf2b..5847a1847b 100644
--- a/api-ref/source/samples/portgroup-update-response.json
+++ b/api-ref/source/samples/portgroup-update-response.json
@@ -1,6 +1,6 @@
 {
   "address": "22:22:22:22:22:22",
-  "created_at": "2016-08-18T22:28:48.165105+00:00",
+  "created_at": "2016-08-18T22:28:48.643434+11:11",
   "extra": {},
   "internal_info": {},
   "links": [
@@ -28,6 +28,6 @@
   ],
   "properties": {},
   "standalone_ports_supported": true,
-  "updated_at": "2016-11-04T17:46:09+00:00",
+  "updated_at": "2016-08-18T22:28:49.653974+00:00",
   "uuid": "e43c722c-248e-4c6e-8ce8-0d8ff129387a"
 }