diff --git a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts
index d2e1364a39..c206162048 100644
--- a/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts
+++ b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts
@@ -7,7 +7,7 @@ import * as assert from 'assert';
 import * as TypeMoq from 'typemoq';
 
 import { nb, ServerInfo } from 'azdata';
-import { getHostAndPortFromEndpoint, isStream, getProvidersForFileName, asyncForEach, clusterEndpointsProperty, getClusterEndpoints, RawEndpoint, IEndpoint, getStandardKernelsForProvider, IStandardKernelWithProvider } from 'sql/workbench/services/notebook/browser/models/notebookUtils';
+import { getHostAndPortFromEndpoint, isStream, getProvidersForFileName, asyncForEach, clusterEndpointsProperty, getClusterEndpoints, RawEndpoint, IEndpoint, getStandardKernelsForProvider, IStandardKernelWithProvider, rewriteUrlUsingRegex } from 'sql/workbench/services/notebook/browser/models/notebookUtils';
 import { INotebookService, DEFAULT_NOTEBOOK_FILETYPE, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/browser/notebookService';
 import { NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/stubs';
 import { tryMatchCellMagic } from 'sql/workbench/services/notebook/browser/utils';
@@ -204,4 +204,16 @@ suite('notebookUtils', function (): void {
 		assert.strictEqual(result.host, '');
 		assert.strictEqual(result.port, undefined);
 	});
+
+	test('rewriteUrlUsingRegex Test', async function (): Promise<void> {
+		// Give a URL that should be rewritten
+		let html = '<a target="_blank" href="https://sparkhead-0.sparkhead-svc:8090/proxy/application_1/“>Link</a>';
+		let result = rewriteUrlUsingRegex(/(https?:\/\/sparkhead.*\/proxy)(.*)/g, html, '1.1.1.1', ':999', '/gateway/default/yarn/proxy');
+		assert.strictEqual(result, '<a target="_blank" href="https://1.1.1.1:999/gateway/default/yarn/proxy/application_1/“>Link</a>', 'Target URL does not match after substitution');
+
+		// Give a URL that should not be rewritten
+		html = '<a target="_blank" href="https://storage-0-0.storage-0-svc.mssql-cluster.svc.cluster.local:8044/node/containerlogs/container_7/root“>Link</a>';
+		result = rewriteUrlUsingRegex(/(https?:\/\/sparkhead.*\/proxy)(.*)/g, html, '1.1.1.1', ':999', '/gateway/default/yarn/proxy');
+		assert.strictEqual(result, '<a target="_blank" href="https://storage-0-0.storage-0-svc.mssql-cluster.svc.cluster.local:8044/node/containerlogs/container_7/root“>Link</a>', 'Target URL should not have been edited');
+	});
 });
diff --git a/src/sql/workbench/services/notebook/browser/models/cell.ts b/src/sql/workbench/services/notebook/browser/models/cell.ts
index 5e69c20b28..e6508f8ce6 100644
--- a/src/sql/workbench/services/notebook/browser/models/cell.ts
+++ b/src/sql/workbench/services/notebook/browser/models/cell.ts
@@ -536,12 +536,10 @@ export class CellModel implements ICellModel {
 							let host = hostAndIp.host ? hostAndIp.host : model.context.serverName;
 							let port = hostAndIp.port ? ':' + hostAndIp.port : defaultPort;
 							let html = result.data['text/html'];
-							// CTP 3.1 and earlier Spark link
-							html = this.rewriteUrlUsingRegex(/(https?:\/\/master.*\/proxy)(.*)/g, html, host, port, yarnUi);
-							// CTP 3.2 and later spark link
-							html = this.rewriteUrlUsingRegex(/(https?:\/\/sparkhead.*\/proxy)(.*)/g, html, host, port, yarnUi);
+							// BDC Spark UI Link
+							html = notebookUtils.rewriteUrlUsingRegex(/(https?:\/\/sparkhead.*\/proxy)(.*)/g, html, host, port, yarnUi);
 							// Driver link
-							html = this.rewriteUrlUsingRegex(/(https?:\/\/storage.*\/containerlogs)(.*)/g, html, host, port, driverLog);
+							html = notebookUtils.rewriteUrlUsingRegex(/(https?:\/\/storage.*\/containerlogs)(.*)/g, html, host, port, driverLog);
 							(<nb.IDisplayResult>output).data['text/html'] = html;
 						}
 					}
@@ -552,19 +550,6 @@ export class CellModel implements ICellModel {
 		return output;
 	}
 
-	private rewriteUrlUsingRegex(regex: RegExp, html: string, host: string, port: string, target: string): string {
-		return html.replace(regex, function (a, b, c) {
-			let ret = '';
-			if (b !== '') {
-				ret = 'https://' + host + port + target;
-			}
-			if (c !== '') {
-				ret = ret + c;
-			}
-			return ret;
-		});
-	}
-
 	public setStdInHandler(handler: nb.MessageHandler<nb.IStdinMessage>): void {
 		this._stdInHandler = handler;
 	}
diff --git a/src/sql/workbench/services/notebook/browser/models/notebookUtils.ts b/src/sql/workbench/services/notebook/browser/models/notebookUtils.ts
index 9d12452b81..31b5024b39 100644
--- a/src/sql/workbench/services/notebook/browser/models/notebookUtils.ts
+++ b/src/sql/workbench/services/notebook/browser/models/notebookUtils.ts
@@ -110,6 +110,19 @@ export function getHostAndPortFromEndpoint(endpoint: string): HostAndIp {
 	};
 }
 
+export function rewriteUrlUsingRegex(regex: RegExp, html: string, host: string, port: string, target: string): string {
+	return html.replace(regex, function (a, b, c) {
+		let ret = '';
+		if (b !== '') {
+			ret = 'https://' + host + port + target;
+		}
+		if (c !== '') {
+			ret = ret + c;
+		}
+		return ret;
+	});
+}
+
 export interface RawEndpoint {
 	serviceName: string;
 	description?: string;