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 e1ef8f07..d1edd9df 100644
--- a/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql
+++ b/samples/features/sql-big-data-cluster/bootstrap-sample-db.sql
@@ -76,28 +76,28 @@ BEGIN
 
 	-- Create default data sources for SQL Big Data Cluster
 	IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlDataPool')
-		IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
-			CREATE EXTERNAL DATA SOURCE SqlDataPool
-			WITH (LOCATION = 'sqldatapool://controller-svc:8080/datapools/default');
-		ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
-			CREATE EXTERNAL DATA SOURCE SqlDataPool
-			WITH (LOCATION = 'sqldatapool://controller-svc/default');
+		CREATE EXTERNAL DATA SOURCE SqlDataPool
+		WITH (LOCATION = 'sqldatapool://controller-svc/default');
 
 	IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
-		IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
-			CREATE EXTERNAL DATA SOURCE SqlStoragePool
-			WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
-		ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
-			CREATE EXTERNAL DATA SOURCE SqlStoragePool
-			WITH (LOCATION = 'sqlhdfs://controller-svc/default');
+		CREATE EXTERNAL DATA SOURCE SqlStoragePool
+		WITH (LOCATION = 'sqlhdfs://controller-svc/default');
 
 	IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
-		CREATE EXTERNAL DATA SOURCE HadoopData
-		WITH(
-				TYPE=HADOOP,
-				LOCATION='hdfs://nmnode-0-svc:9000/',
-				RESOURCE_MANAGER_LOCATION='master-svc:8032'
-		);
+		IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
+			CREATE EXTERNAL DATA SOURCE HadoopData
+			WITH(
+					TYPE=HADOOP,
+					LOCATION='hdfs://nmnode-0-svc:9000/',
+					RESOURCE_MANAGER_LOCATION='master-svc:8032'
+			);
+		ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.2'
+			CREATE EXTERNAL DATA SOURCE HadoopData
+			WITH(
+					TYPE=HADOOP,
+					LOCATION='hdfs://nmnode-0-svc:9000/',
+					RESOURCE_MANAGER_LOCATION='sparkhead-svc:8032'
+			);
 END;
 GO
 
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 41d5a2d3..0e1d2aeb 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
@@ -17,12 +17,21 @@ GO
 -- execution.
 --
 IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
-	CREATE EXTERNAL DATA SOURCE HadoopData
-	WITH(
-			TYPE=HADOOP,
-			LOCATION='hdfs://nmnode-0-svc:9000/',
-			RESOURCE_MANAGER_LOCATION='master-svc:8032'
-	);
+    IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
+        CREATE EXTERNAL DATA SOURCE HadoopData
+        WITH(
+                TYPE=HADOOP,
+                LOCATION='hdfs://nmnode-0-svc:9000/',
+                RESOURCE_MANAGER_LOCATION='master-svc:8032'
+        );
+    ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.2'
+        CREATE EXTERNAL DATA SOURCE HadoopData
+        WITH(
+                TYPE=HADOOP,
+                LOCATION='hdfs://nmnode-0-svc:9000/',
+                RESOURCE_MANAGER_LOCATION='sparkhead-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 983d3eef..49d910a6 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
@@ -7,12 +7,21 @@ GO
 -- execution.
 --
 IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
-    CREATE EXTERNAL DATA SOURCE HadoopData
-    WITH(
-            TYPE=HADOOP,
-            LOCATION='hdfs://nmnode-0-svc:9000/',
-            RESOURCE_MANAGER_LOCATION='master-svc:8032'
-    );
+    IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
+        CREATE EXTERNAL DATA SOURCE HadoopData
+        WITH(
+                TYPE=HADOOP,
+                LOCATION='hdfs://nmnode-0-svc:9000/',
+                RESOURCE_MANAGER_LOCATION='master-svc:8032'
+        );
+    ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.2'
+        CREATE EXTERNAL DATA SOURCE HadoopData
+        WITH(
+                TYPE=HADOOP,
+                LOCATION='hdfs://nmnode-0-svc:9000/',
+                RESOURCE_MANAGER_LOCATION='sparkhead-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 bd9a10ce..e412c528 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
@@ -7,12 +7,21 @@ GO
 -- execution.
 --
 IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'HadoopData')
-    CREATE EXTERNAL DATA SOURCE HadoopData
-    WITH(
-            TYPE=HADOOP,
-            LOCATION='hdfs://nmnode-0-svc:9000/',
-            RESOURCE_MANAGER_LOCATION='master-svc:8032'
-    );
+    IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
+        CREATE EXTERNAL DATA SOURCE HadoopData
+        WITH(
+                TYPE=HADOOP,
+                LOCATION='hdfs://nmnode-0-svc:9000/',
+                RESOURCE_MANAGER_LOCATION='master-svc:8032'
+        );
+    ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.2'
+        CREATE EXTERNAL DATA SOURCE HadoopData
+        WITH(
+                TYPE=HADOOP,
+                LOCATION='hdfs://nmnode-0-svc:9000/',
+                RESOURCE_MANAGER_LOCATION='sparkhead-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 fa8dd511..6be7ab0b 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
@@ -4,12 +4,8 @@ GO
 -- Create external data source for HDFS inside SQL big data cluster.
 --
 IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
-    IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
-    ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc/default');
+    CREATE EXTERNAL DATA SOURCE SqlStoragePool
+    WITH (LOCATION = 'sqlhdfs://controller-svc/default');
 
 -- 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 a3d54cde..5c64a3ef 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
@@ -4,12 +4,8 @@ GO
 -- Create external data source for HDFS inside SQL big data cluster.
 --
 IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
-    IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
-    ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc/default');
+    CREATE EXTERNAL DATA SOURCE SqlStoragePool
+    WITH (LOCATION = 'sqlhdfs://controller-svc/default');
 
 -- 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 50a22854..7d8d40f5 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
@@ -4,12 +4,8 @@ GO
 -- Create external data source for HDFS inside SQL big data cluster.
 --
 IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
-    IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
-    ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc/default');
+    CREATE EXTERNAL DATA SOURCE SqlStoragePool
+    WITH (LOCATION = 'sqlhdfs://controller-svc/default');
 
 -- 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 1ac73000..2e3bc194 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
@@ -4,12 +4,8 @@ GO
 -- Create external data source for HDFS inside SQL big data cluster.
 --
 IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
-    IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
-    ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc/default');
+    CREATE EXTERNAL DATA SOURCE SqlStoragePool
+    WITH (LOCATION = 'sqlhdfs://controller-svc/default');
 
 -- 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 08afb537..6b6b4753 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
@@ -4,12 +4,8 @@ GO
 -- Create external data source for HDFS inside SQL big data cluster.
 --
 IF NOT EXISTS(SELECT * FROM sys.external_data_sources WHERE name = 'SqlStoragePool')
-    IF SERVERPROPERTY('ProductLevel') = 'CTP3.0'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc:8080/default');
-    ELSE IF SERVERPROPERTY('ProductLevel') = 'CTP3.1'
-        CREATE EXTERNAL DATA SOURCE SqlStoragePool
-        WITH (LOCATION = 'sqlhdfs://controller-svc/default');
+    CREATE EXTERNAL DATA SOURCE SqlStoragePool
+    WITH (LOCATION = 'sqlhdfs://controller-svc/default');
 
 -- Create file format for parquet file with appropriate properties.
 --