diff --git a/build.py b/build.py
index 8198ea24..a2b4d88f 100644
--- a/build.py
+++ b/build.py
@@ -64,6 +64,9 @@ def build():
     else:
         platforms_to_build = [utility.get_current_platform()]
 
+    # Temporary environment variable to change the target platform we are building for.
+    # Ex. Building for a ARM target on a x64 host.
+    platforms_to_build = os.getenv('PLATFORM_OVERRIDE', platforms_to_build)
     for platform in platforms_to_build:
         # For the current platform, populate the appropriate binaries and
         # generate the wheel.
diff --git a/mssqlcli/mssqltoolsservice/externals.py b/mssqlcli/mssqltoolsservice/externals.py
index 9f7db8f1..093bc533 100644
--- a/mssqlcli/mssqltoolsservice/externals.py
+++ b/mssqlcli/mssqltoolsservice/externals.py
@@ -17,7 +17,8 @@
     'manylinux1_x86_64': SQLTOOLSSERVICE_BASE + 'manylinux1/' + 'Microsoft.SqlTools.ServiceLayer-linux-x64-netcoreapp2.0.tar.gz',
     'macosx_10_11_intel': SQLTOOLSSERVICE_BASE + 'macosx_10_11_intel/' + 'Microsoft.SqlTools.ServiceLayer-osx-x64-netcoreapp2.0.tar.gz',
     'win_amd64': SQLTOOLSSERVICE_BASE + 'win_amd64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip',
-    'win32': SQLTOOLSSERVICE_BASE + 'win32/' + 'Microsoft.SqlTools.ServiceLayer-win-x86-netcoreapp2.0.zip'
+    'win32': SQLTOOLSSERVICE_BASE + 'win32/' + 'Microsoft.SqlTools.ServiceLayer-win-x86-netcoreapp2.0.zip',
+    'linux_armv6l': SQLTOOLSSERVICE_BASE + 'linux-arm/' + 'Microsoft.SqlTools.ServiceLayer-linux-arm-netcoreapp2.0.tar.gz'
 }
 
 TARGET_DIRECTORY = os.path.abspath(os.path.join(os.path.abspath(__file__), '..', 'bin'))
@@ -33,7 +34,7 @@ def copy_sqltoolsservice(platform):
     if not platform or platform not in SUPPORTED_PLATFORMS:
         print('{} is not supported.'.format(platform))
         print('Please provide a valid platform flag.' +
-              '[win32, win_amd64, manylinux1_x86_64, macosx_10_11_intel]')
+              '[win32, win_amd64, manylinux1_x86_64, macosx_10_11_intel, linux-arm]')
         sys.exit(1)
 
     copy_file_path = SUPPORTED_PLATFORMS[platform]
diff --git a/sqltoolsservice/linux_armv6l/Microsoft.SqlTools.ServiceLayer-linux-arm-netcoreapp2.0.tar.gz b/sqltoolsservice/linux_armv6l/Microsoft.SqlTools.ServiceLayer-linux-arm-netcoreapp2.0.tar.gz
new file mode 100644
index 00000000..5fc9960f
Binary files /dev/null and b/sqltoolsservice/linux_armv6l/Microsoft.SqlTools.ServiceLayer-linux-arm-netcoreapp2.0.tar.gz differ
diff --git a/sqltoolsservice/linux_armv7l/Microsoft.SqlTools.ServiceLayer-linux-arm64-netcoreapp2.1.tar.gz b/sqltoolsservice/linux_armv7l/Microsoft.SqlTools.ServiceLayer-linux-arm64-netcoreapp2.1.tar.gz
new file mode 100644
index 00000000..b2fcec29
Binary files /dev/null and b/sqltoolsservice/linux_armv7l/Microsoft.SqlTools.ServiceLayer-linux-arm64-netcoreapp2.1.tar.gz differ
diff --git a/sqltoolsservice/win-arm/Microsoft.SqlTools.ServiceLayer-win-arm-netcoreapp2.0.zip b/sqltoolsservice/win-arm/Microsoft.SqlTools.ServiceLayer-win-arm-netcoreapp2.0.zip
new file mode 100644
index 00000000..f12814d7
Binary files /dev/null and b/sqltoolsservice/win-arm/Microsoft.SqlTools.ServiceLayer-win-arm-netcoreapp2.0.zip differ