diff --git a/azure-pipelines.tags.yml b/azure-pipelines.tags.yml
index 9c0118a9e..85f39b43f 100644
--- a/azure-pipelines.tags.yml
+++ b/azure-pipelines.tags.yml
@@ -30,6 +30,10 @@ resources:
       type: github
       endpoint: keboola
       name: keboola/git-service-php-api-client
+    - repository: php-api-client-base
+      type: github
+      endpoint: keboola
+      name: keboola/php-api-client-base
     - repository: input-mapping
       type: github
       endpoint: keboola
@@ -144,6 +148,14 @@ jobs:
       libraryPath: libs/git-service-api-client
       tagPrefix: git-service-api-client/
 
+  - template: azure-pipelines/jobs/split-library.yml
+    parameters:
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/php-api-client-base/')
+      sourceRepo: platform-libraries
+      targetRepo: php-api-client-base
+      libraryPath: libs/php-api-client-base
+      tagPrefix: php-api-client-base/
+
   - template: azure-pipelines/jobs/split-library.yml
     parameters:
       condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/input-mapping/')
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0ead037f7..92b793912 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,6 +30,10 @@ resources:
       type: github
       endpoint: keboola
       name: keboola/git-service-php-api-client
+    - repository: php-api-client-base
+      type: github
+      endpoint: keboola
+      name: keboola/php-api-client-base
     - repository: input-mapping
       type: github
       endpoint: keboola
@@ -439,6 +443,14 @@ stages:
           libraryPath: libs/git-service-api-client
           tagPrefix: git-service-api-client/
 
+      - template: azure-pipelines/jobs/split-library.yml
+        parameters:
+          condition: and(succeeded(), stageDependencies.build.checkChanges.outputs['findChanges.changedProjects_phpApiClientBase'])
+          sourceRepo: platform-libraries
+          targetRepo: php-api-client-base
+          libraryPath: libs/php-api-client-base
+          tagPrefix: php-api-client-base/
+
       - template: azure-pipelines/jobs/split-library.yml
         parameters:
           condition: and(succeeded(), stageDependencies.build.checkChanges.outputs['findChanges.changedProjects_inputMapping'])