diff --git a/build/azure-pipelines/build-product.yml b/build/azure-pipelines/build-product.yml
index 790ec5c9..69c4d507 100644
--- a/build/azure-pipelines/build-product.yml
+++ b/build/azure-pipelines/build-product.yml
@@ -2,12 +2,21 @@ trigger:
   tags:
     include:
       - v*
+  branches:
+    include:
+      - main
 
 pr: none
 
+parameters:
+  - name: PushToGithub
+    default: true
+    type: boolean
+    displayName: Push packages to github
+
 stages:
   - stage: Compile
-    displayName: Compile sqlcmd on all 3 platforms
+    displayName: Compile sqlcmd on all supported platforms
     jobs:
     - job: Compile_sqlcmd
       strategy:
@@ -37,6 +46,11 @@ stages:
             artifact: WindowsArm
             os:
             arch: arm
+          linuxs390x:
+            imageName: 'ubuntu-latest'
+            artifact: LinuxS390x
+            os:
+            arch: s390x
       pool:
         vmImage: $(imageName)
       steps:
@@ -163,6 +177,15 @@ stages:
           tarCompression: 'bz2'
           archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(VERSION_TAG)-linux-arm64.tar.bz2'
   
+      - task: ArchiveFiles@2
+        displayName: Tar Linux s390x binary
+        inputs:
+          rootFolderOrFile: '$(Pipeline.Workspace)\SqlcmdLinuxS390x'
+          includeRootFolder: false
+          archiveType: 'tar'
+          tarCompression: 'bz2'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/sqlcmd-$(VERSION_TAG)-linux-s390x.tar.bz2'
+  
       - task: PublishPipelineArtifact@1
         displayName: 'Publish release archives'
         inputs:
@@ -170,6 +193,7 @@ stages:
           artifactName: SqlcmdRelease
           
       - task: GitHubRelease@1
+        condition: eq('${{ parameters.PushToGithub}}', 'true')
         inputs:
           gitHubConnection: 'gosqlcmd_github'
           repositoryName: '$(Build.Repository.Name)'