diff --git a/azure-pipelines-master.yml b/azure-pipelines-master.yml
deleted file mode 100644
index 0ba9c8d2..00000000
--- a/azure-pipelines-master.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# File: drupal-helfi/azure-pipelines.yml
-
-# Continuous integration (CI) triggers cause a pipeline to run whenever you push 
-# an update to the specified branches or you push specified tags.
-trigger:
-  branches:
-    include:
-    - dev
-  paths:
-    exclude:
-    - README.md
-
-# Pull request (PR) triggers cause a pipeline to run whenever a pull request is 
-# opened with one of the specified target branches, or when updates are made to 
-# such a pull request.
-#
-# GitHub creates a new ref when a pull request is created. The ref points to a 
-# merge commit, which is the merged code between the source and target branches 
-# of the pull request.
-#
-# Opt out of pull request validation 
-pr: none
-
-# By default, use self-hosted agents
-pool: Default
-
-resources:
-  repositories:
-  # Azure DevOps repository
-  - repository: strategia-talous-pipelines
-    type: git
-    # project/repository
-    name: strategia-talous/strategia-talous-pipelines
-
-extends:
-  template: azure-pipelines-drupal-master.yml@strategia-talous-pipelines
diff --git a/azure-pipelines-prod.yml b/azure-pipelines-prod.yml
deleted file mode 100644
index 9ce687cd..00000000
--- a/azure-pipelines-prod.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# File: drupal-helfi/azure-pipelines.yml
-
-# Continuous integration (CI) triggers cause a pipeline to run whenever you push 
-# an update to the specified branches or you push specified tags.
-trigger: none
-#   branches:
-#     include:
-#     - main
-#   paths:
-#     exclude:
-#     - README.md
-
-# Pull request (PR) triggers cause a pipeline to run whenever a pull request is 
-# opened with one of the specified target branches, or when updates are made to 
-# such a pull request.
-#
-# GitHub creates a new ref when a pull request is created. The ref points to a 
-# merge commit, which is the merged code between the source and target branches 
-# of the pull request.
-#
-# Opt out of pull request validation 
-pr: none
-
-# By default, use self-hosted agents
-pool: Default
-
-resources:
-  repositories:
-  # Azure DevOps repository
-  - repository: strategia-talous-pipelines
-    type: git
-    # project/repository
-    name: strategia-talous/strategia-talous-pipelines
-
-extends:
-  template: azure-pipelines-drupal-prod.yml@strategia-talous-pipelines
diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml
deleted file mode 100644
index 6fab7fd0..00000000
--- a/azure-pipelines-staging.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# File: drupal-helfi/azure-pipelines.yml
-
-# Continuous integration (CI) triggers cause a pipeline to run whenever you push 
-# an update to the specified branches or you push specified tags.
-trigger:
-  branches:
-    include:
-    - main
-  paths:
-    exclude:
-    - README.md
-
-# Pull request (PR) triggers cause a pipeline to run whenever a pull request is 
-# opened with one of the specified target branches, or when updates are made to 
-# such a pull request.
-#
-# GitHub creates a new ref when a pull request is created. The ref points to a 
-# merge commit, which is the merged code between the source and target branches 
-# of the pull request.
-#
-# Opt out of pull request validation 
-pr: none
-
-# By default, use self-hosted agents
-pool: Default
-
-resources:
-  repositories:
-  # Azure DevOps repository
-  - repository: strategia-talous-pipelines
-    type: git
-    # project/repository
-    name: strategia-talous/strategia-talous-pipelines
-
-extends:
-  template: azure-pipelines-drupal-staging.yml@strategia-talous-pipelines
diff --git a/pipelines/drupal-production.yml b/pipelines/drupal-production.yml
new file mode 100644
index 00000000..fd87f672
--- /dev/null
+++ b/pipelines/drupal-production.yml
@@ -0,0 +1,49 @@
+# Continuous integration (CI) triggers cause a pipeline to run whenever you push
+# an update to the specified branches or you push specified tags.
+trigger: none
+# trigger: 
+#   batch: true
+#   tags:
+#     include:
+#       - 202*
+#   paths:
+#     exclude:
+#     - '*.md'
+#     - '.github/'
+#     - 'pipelines/drupal-test.yml'
+#     - 'pipelines/drupal-staging.yml'
+
+# Pull request (PR) triggers cause a pipeline to run whenever a pull request is
+# opened with one of the specified target branches, or when updates are made to
+# such a pull request.
+#
+# GitHub creates a new ref when a pull request is created. The ref points to a
+# merge commit, which is the merged code between the source and target branches
+# of the pull request.
+#
+# Opt out of pull request validation
+pr: none
+
+# By default, use self-hosted agents
+pool: Default
+
+resources:
+  repositories:
+    # Azure DevOps repository
+    - repository: strategia-talous-pipelines
+      type: git
+      # Azure DevOps project/repository
+      name: strategia-talous/strategia-talous-pipelines
+
+extends:
+  # Filename in Azure DevOps Repository
+  template: components/drupal/pipelines/drupal-production.yml@strategia-talous-pipelines
+  # parameters:
+    # Application build arguments and config map values as key value pairs.
+    # Does not contain all buildArguments or configMap values, the rest located in strategia-talous-pipelines
+    # Default value to phpVersion is set on template.
+    # The values here will override the values defined in the strategia-talous-pipelines repository
+    # buildArgs:
+    #   DEBUG: 1
+    # configMap: # pod environment variables
+    #   DEBUG: 1
diff --git a/pipelines/drupal-staging.yml b/pipelines/drupal-staging.yml
new file mode 100644
index 00000000..8842fea3
--- /dev/null
+++ b/pipelines/drupal-staging.yml
@@ -0,0 +1,48 @@
+# Continuous integration (CI) triggers cause a pipeline to run whenever you push
+# an update to the specified branches or you push specified tags.
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+  paths:
+    exclude:
+    - '*.md'
+    - '.github/'
+    - 'pipelines/drupal-test.yml'
+    - 'pipelines/drupal-production.yml'
+
+# Pull request (PR) triggers cause a pipeline to run whenever a pull request is
+# opened with one of the specified target branches, or when updates are made to
+# such a pull request.
+#
+# GitHub creates a new ref when a pull request is created. The ref points to a
+# merge commit, which is the merged code between the source and target branches
+# of the pull request.
+#
+# Opt out of pull request validation
+pr: none
+
+# By default, use self-hosted agents
+pool: Default
+
+resources:
+  repositories:
+    # Azure DevOps repository
+    - repository: strategia-talous-pipelines
+      type: git
+      # Azure DevOps project/repository
+      name: strategia-talous/strategia-talous-pipelines
+
+extends:
+  # Filename in Azure DevOps Repository
+  template: components/drupal/pipelines/drupal-staging.yml@strategia-talous-pipelines
+  # parameters:
+    # Application build arguments and config map values as key value pairs.
+    # Does not contain all buildArguments or configMap values, the rest located in strategia-talous-pipelines
+    # Default value to phpVersion is set on template.
+    # The values here will override the values defined in the strategia-talous-pipelines repository
+    # buildArgs:
+    #   DEBUG: 1
+    # configMap: # pod environment variables
+    #   DEBUG: 1
diff --git a/pipelines/drupal-test.yml b/pipelines/drupal-test.yml
new file mode 100644
index 00000000..74196d45
--- /dev/null
+++ b/pipelines/drupal-test.yml
@@ -0,0 +1,48 @@
+# Continuous integration (CI) triggers cause a pipeline to run whenever you push
+# an update to the specified branches or you push specified tags.
+trigger:
+  batch: true
+  branches:
+    include:
+      - dev
+  paths:
+    exclude:
+    - '*.md'
+    - '.github/'
+    - 'pipelines/drupal-staging.yml'
+    - 'pipelines/drupal-production.yml'
+
+# Pull request (PR) triggers cause a pipeline to run whenever a pull request is
+# opened with one of the specified target branches, or when updates are made to
+# such a pull request.
+#
+# GitHub creates a new ref when a pull request is created. The ref points to a
+# merge commit, which is the merged code between the source and target branches
+# of the pull request.
+#
+# Opt out of pull request validation
+pr: none
+
+# By default, use self-hosted agents
+pool: Default
+
+resources:
+  repositories:
+    # Azure DevOps repository
+    - repository: strategia-talous-pipelines
+      type: git
+      # Azure DevOps project/repository
+      name: strategia-talous/strategia-talous-pipelines
+
+extends:
+  # Filename in Azure DevOps Repository
+  template: components/drupal/pipelines/drupal-test.yml@strategia-talous-pipelines
+  # parameters:
+    # Application build arguments and config map values as key value pairs.
+    # Does not contain all buildArguments or configMap values, the rest located in strategia-talous-pipelines
+    # Default value to phpVersion is set on template.
+    # The values here will override the values defined in the strategia-talous-pipelines repository
+    # buildArgs:
+    #   DEBUG: 1
+    # configMap: # pod environment variables
+    #   DEBUG: 1