diff --git a/build/build.bat b/build/build.bat
index d5def627ce..9317bbf84f 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -21,6 +21,9 @@ call build\scripts\people.sh
 echo "ASC.Web.Files.Client"
 call build\scripts\files.sh
 
+echo "ASC.UrlShortener"
+call build\scripts\urlshortener.sh
+
 echo "ASC.Web.sln"
 call dotnet build ASC.Web.sln  /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal
 
diff --git a/build/publish.bat b/build/publish.bat
index bb31d4b553..2306c37e43 100644
--- a/build/publish.bat
+++ b/build/publish.bat
@@ -27,5 +27,10 @@ xcopy ..\products\ASC.People\Client\*.* publish\ASC.People.Client\ /E /R /Y
 echo "Publish ASC.Web.Client project"
 xcopy ..\web\ASC.Web.Client\*.* publish\ASC.Web.Client\ /E /R /Y
 
+echo "Publish ASC.UrlShortener.Svc.csproj project"
+dotnet publish ..\common\services\ASC.UrlShortener.Svc\ASC.UrlShortener.Svc.csproj -c Release -o publish/ASC.UrlShortener.Svc/
+xcopy ..\common\ASC.UrlShortener\*.* publish\ASC.UrlShortener\ /E /R /Y
+if not %errorlevel% == 0 goto end
+
 :end
 pause
\ No newline at end of file
diff --git a/build/rebuild.bat b/build/rebuild.bat
index 23ec784dc7..abc16a2e73 100644
--- a/build/rebuild.bat
+++ b/build/rebuild.bat
@@ -34,6 +34,9 @@ call yarn link "asc-web-components" --cwd products/ASC.Files/Client
 call yarn link "asc-web-common" --cwd products/ASC.Files/Client
 call yarn install --cwd products/ASC.Files/Client > build\ASC.Web.Files.Client.log
 
+echo "ASC.UrlShortener"
+call yarn install --cwd common/ASC.UrlShortener > build\ASC.UrlShortener.log
+
 echo "ASC.Web.sln"
 call dotnet build ASC.Web.sln  /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal
 
diff --git a/build/run/UrlShortenerService.bat b/build/run/UrlShortenerService.bat
new file mode 100644
index 0000000000..37f4420f65
--- /dev/null
+++ b/build/run/UrlShortenerService.bat
@@ -0,0 +1,2 @@
+echo "RUN ASC.UrlShortener.Svc"
+call dotnet run --project ..\..\common\services\ASC.UrlShortener.Svc\ASC.UrlShortener.Svc.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=urlshortener
\ No newline at end of file
diff --git a/build/scripts/urlshortener.sh b/build/scripts/urlshortener.sh
new file mode 100644
index 0000000000..56d3ab4880
--- /dev/null
+++ b/build/scripts/urlshortener.sh
@@ -0,0 +1 @@
+yarn install --cwd common/ASC.UrlShortener --frozen-lockfile
\ No newline at end of file