diff --git a/marketplace/couchbase-byol.template b/marketplace/couchbase-byol.template
index 8788e54..7fd8f4b 100644
--- a/marketplace/couchbase-byol.template
+++ b/marketplace/couchbase-byol.template
@@ -197,7 +197,7 @@
                 "echo \"Formatting disk...\"\n",
 
                 "DEVICE=/dev/sdk\n",
-                "MOUNTPOINT=/mnt/datadisk\n",
+                "MOUNTPOINT=/data/couchbase\n",
 
                 "echo \"Creating the filesystem.\"\n",
                 "mkfs -t ext4 ${DEVICE}\n",
@@ -294,8 +294,8 @@
                 "  output=`./couchbase-cli node-init \\\n",
                 "    --cluster=$nodePublicDNS \\\n",
                 "    --node-init-hostname=$nodePublicDNS \\\n",
-                "    --node-init-data-path=/mnt/datadisk/data \\\n",
-                "    --node-init-index-path=/mnt/datadisk/index \\\n",
+                "    --node-init-data-path=/data/couchbase/data \\\n",
+                "    --node-init-index-path=/data/couchbase/index \\\n",
                 "    --user=$adminUsername \\\n",
                 "    --pass=$adminPassword`\n",
                 "  echo node-init output \\'$output\\'\n",
diff --git a/marketplace/couchbase-hourlypricing.template b/marketplace/couchbase-hourlypricing.template
index 57b7620..d947508 100644
--- a/marketplace/couchbase-hourlypricing.template
+++ b/marketplace/couchbase-hourlypricing.template
@@ -197,7 +197,7 @@
                 "echo \"Formatting disk...\"\n",
 
                 "DEVICE=/dev/sdk\n",
-                "MOUNTPOINT=/mnt/datadisk\n",
+                "MOUNTPOINT=/data/couchbase\n",
 
                 "echo \"Creating the filesystem.\"\n",
                 "mkfs -t ext4 ${DEVICE}\n",
@@ -294,8 +294,8 @@
                 "  output=`./couchbase-cli node-init \\\n",
                 "    --cluster=$nodePublicDNS \\\n",
                 "    --node-init-hostname=$nodePublicDNS \\\n",
-                "    --node-init-data-path=/mnt/datadisk/data \\\n",
-                "    --node-init-index-path=/mnt/datadisk/index \\\n",
+                "    --node-init-data-path=/data/couchbase/data \\\n",
+                "    --node-init-index-path=/data/couchbase/index \\\n",
                 "    --user=$adminUsername \\\n",
                 "    --pass=$adminPassword`\n",
                 "  echo node-init output \\'$output\\'\n",
diff --git a/scripts/server.sh b/scripts/server.sh
index 66da5bc..166877b 100755
--- a/scripts/server.sh
+++ b/scripts/server.sh
@@ -116,8 +116,8 @@ do
   output=`./couchbase-cli node-init \
     --cluster=$nodePublicDNS \
     --node-init-hostname=$nodePublicDNS \
-    --node-init-data-path=/mnt/datadisk/data \
-    --node-init-index-path=/mnt/datadisk/index \
+    --node-init-data-path=/data/couchbase/data \
+    --node-init-index-path=/data/couchbase/index \
     --user=$adminUsername \
     --pass=$adminPassword`
   echo node-init output \'$output\'
diff --git a/scripts/util.sh b/scripts/util.sh
index bf5c91f..0a1d217 100644
--- a/scripts/util.sh
+++ b/scripts/util.sh
@@ -3,7 +3,7 @@
 formatDataDisk ()
 {
   DEVICE=/dev/sdk
-  MOUNTPOINT=/mnt/datadisk
+  MOUNTPOINT=/data/couchbase
 
   echo "Creating the filesystem."
   mkfs -t ext4 ${DEVICE}