diff --git a/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql b/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql
index 982b4835..8cdd71f7 100644
--- a/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql
+++ b/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql
@@ -85,7 +85,7 @@ BEGIN
 			WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
 		ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
 			CREATE EXTERNAL DATA SOURCE SqlStoragePool
-			WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
+			WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
 
 	IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
 		IF SERVERPROPERTY('ProductLevel') = 'CTP2.4'
@@ -99,8 +99,8 @@ BEGIN
 			CREATE EXTERNAL DATA SOURCE HadoopData
 			WITH(
 					TYPE=HADOOP,
-					LOCATION='hdfs://nmnode-0-0.nmnode-0-svc:9000/',
-					RESOURCE_MANAGER_LOCATION='master-0.master-svc:8032'
+					LOCATION='hdfs://nmnode-0-svc:9000/',
+					RESOURCE_MANAGER_LOCATION='master-svc:8032'
 			);
 END;
 GO
@@ -118,11 +118,17 @@ BEGIN
 	FETCH @sample_dbs INTO @file;
 	IF @@FETCH_STATUS < 0 BREAK;
 
+	-- Restore the sample databases:
 	EXECUTE #restore_database @file;
+
+	-- Get database name used in restore:
 	SET @proc = CONCAT(QUOTENAME(LEFT(@file, CHARINDEX('.', @file)-1)), N'.sys.sp_executesql');
 
 	EXECUTE @proc N'#create_data_sources';
 
+	-- Set compatibility level to 150:
+	EXECUTE @proc N'ALTER DATABASE CURRENT SET COMPATIBILITY_LEVEL = 150';
+
 	-- Rename TPCx-BB database:
 	IF DB_ID('tpcxbb_1gb') IS NOT NULL
 		ALTER DATABASE tpcxbb_1gb MODIFY NAME = sales;
diff --git a/samples/features/sql-big-data-cluster/data-virtualization/hadoop/inventory-export-hdfs-rcfile.sql b/samples/features/sql-big-data-cluster/data-virtualization/hadoop/inventory-export-hdfs-rcfile.sql
index 93936138..a934f203 100644
--- a/samples/features/sql-big-data-cluster/data-virtualization/hadoop/inventory-export-hdfs-rcfile.sql
+++ b/samples/features/sql-big-data-cluster/data-virtualization/hadoop/inventory-export-hdfs-rcfile.sql
@@ -28,8 +28,8 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
 		CREATE EXTERNAL DATA SOURCE HadoopData
 		WITH(
 				TYPE=HADOOP,
-				LOCATION='hdfs://nmnode-0-0.nmnode-0-svc:9000/',
-				RESOURCE_MANAGER_LOCATION='master-0.master-svc:8032'
+				LOCATION='hdfs://nmnode-0-svc:9000/',
+				RESOURCE_MANAGER_LOCATION='master-svc:8032'
 		);
 
 -- Create file format for RCFILE with appropriate properties.
diff --git a/samples/features/sql-big-data-cluster/data-virtualization/hadoop/product-reviews-hdfs-orc.sql b/samples/features/sql-big-data-cluster/data-virtualization/hadoop/product-reviews-hdfs-orc.sql
index 40b7bb06..7f9b223b 100644
--- a/samples/features/sql-big-data-cluster/data-virtualization/hadoop/product-reviews-hdfs-orc.sql
+++ b/samples/features/sql-big-data-cluster/data-virtualization/hadoop/product-reviews-hdfs-orc.sql
@@ -18,8 +18,8 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
 		CREATE EXTERNAL DATA SOURCE HadoopData
 		WITH(
 				TYPE=HADOOP,
-				LOCATION='hdfs://nmnode-0-0.nmnode-0-svc:9000/',
-				RESOURCE_MANAGER_LOCATION='master-0.master-svc:8032'
+				LOCATION='hdfs://nmnode-0-svc:9000/',
+				RESOURCE_MANAGER_LOCATION='master-svc:8032'
 		);
 
 -- Create file format for orc file with appropriate properties.
diff --git a/samples/features/sql-big-data-cluster/data-virtualization/hadoop/web-clickstreams-hdfs-orc.sql b/samples/features/sql-big-data-cluster/data-virtualization/hadoop/web-clickstreams-hdfs-orc.sql
index 18422fcf..90917c3b 100644
--- a/samples/features/sql-big-data-cluster/data-virtualization/hadoop/web-clickstreams-hdfs-orc.sql
+++ b/samples/features/sql-big-data-cluster/data-virtualization/hadoop/web-clickstreams-hdfs-orc.sql
@@ -18,8 +18,8 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
 		CREATE EXTERNAL DATA SOURCE HadoopData
 		WITH(
 				TYPE=HADOOP,
-				LOCATION='hdfs://nmnode-0-0.nmnode-0-svc:9000/',
-				RESOURCE_MANAGER_LOCATION='master-0.master-svc:8032'
+				LOCATION='hdfs://nmnode-0-svc:9000/',
+				RESOURCE_MANAGER_LOCATION='master-svc:8032'
 		);
 
 -- Create file format for orc file with appropriate properties.
diff --git a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-csv.sql b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-csv.sql
index c8797fed..f6b87442 100644
--- a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-csv.sql
+++ b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-csv.sql
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
 		WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
 	ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
 		CREATE EXTERNAL DATA SOURCE SqlStoragePool
-		WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
+		WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
 
 -- Create file format for CSV separated file with appropriate properties.
 --
diff --git a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-parquet.sql b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-parquet.sql
index 5c8545dc..a0eba2d5 100644
--- a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-parquet.sql
+++ b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-parquet.sql
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
 		WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
 	ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
 		CREATE EXTERNAL DATA SOURCE SqlStoragePool
-		WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
+		WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
 
 -- Create file format for parquet file with appropriate properties.
 --
diff --git a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-tsv.sql b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-tsv.sql
index 6e0175d9..8b7da015 100644
--- a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-tsv.sql
+++ b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/product-reviews-hdfs-tsv.sql
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
 		WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
 	ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
 		CREATE EXTERNAL DATA SOURCE SqlStoragePool
-		WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
+		WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
 
 -- Create file format for tab separated file with appropriate properties.
 --
diff --git a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-csv.sql b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-csv.sql
index 6f683a84..d0b3cfde 100644
--- a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-csv.sql
+++ b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-csv.sql
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
 		WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
 	ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
 		CREATE EXTERNAL DATA SOURCE SqlStoragePool
-		WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
+		WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
 
 -- Create file format for CSV file with appropriate properties.
 --
diff --git a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-parquet.sql b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-parquet.sql
index 1164a26e..7fb2fcdc 100644
--- a/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-parquet.sql
+++ b/samples/features/sql-big-data-cluster/data-virtualization/storage-pool/web-clickstreams-hdfs-parquet.sql
@@ -9,7 +9,7 @@ IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePo
 		WITH (LOCATION = 'sqlhdfs://service-master-pool:50070');
 	ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP2.5'
 		CREATE EXTERNAL DATA SOURCE SqlStoragePool
-		WITH (LOCATION = 'sqlhdfs://nmnode-0-0.nmnode-0-svc:50070');
+		WITH (LOCATION = 'sqlhdfs://nmnode-0-svc:50070');
 
 -- Create file format for parquet file with appropriate properties.
 --