diff --git a/azure-pipelines-devtest.yml b/azure-pipelines-devtest.yml
deleted file mode 100644
index f9383bac..00000000
--- a/azure-pipelines-devtest.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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:
-    - 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
-
-# Image tag name for Fuse projects
-#parameters:
-#- name: imagetag
-#  displayName: Image tag to be built and/or deployed
-#  type: string
-#  default: latest
-
-resources:
-  repositories:
-  # Azure DevOps repository
-  - repository: infofinland-pipelines
-    type: git
-    # Azure DevOps project/repository
-    name: infofinland/infofinland-pipelines
-
-extends:
-  # Filename in Azure DevOps Repository (note possible -ui or -api)
-  # Django example: azure-pipelines-PROJECTNAME-api-master.yml
-  # Drupal example: azure-pipelines-drupal-master.yml
-  template: azure-pipelines-infofinland-drupal-devtest.yml@infofinland-pipelines
-  # Image tag name for Fuse projects
-  #parameters:
-    #imagetag: ${{ parameters.imagetag }}
diff --git a/azure-pipelines-stageprod.yml b/azure-pipelines-stageprod.yml
deleted file mode 100644
index f05e85e5..00000000
--- a/azure-pipelines-stageprod.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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:
-    - 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
-
-# Image tag name for Fuse projects
-#parameters:
-#- name: imagetag
-#  displayName: Image tag to be built and/or deployed
-#  type: string
-#  default: latest
-
-resources:
-  repositories:
-  # Azure DevOps repository
-  - repository: infofinland-pipelines
-    type: git
-    # Azure DevOps project/repository
-    name: infofinland/infofinland-pipelines
-
-extends:
-  # Filename in Azure DevOps Repository (note possible -ui or -api)
-  # Django example: azure-pipelines-PROJECTNAME-api-release.yml
-  # Drupal example: azure-pipelines-drupal-release.yml
-  template: azure-pipelines-infofinland-drupal-stageprod.yml@infofinland-pipelines
-  #parameters:
-    #imagetag: ${{ parameters.imagetag }}
diff --git a/azure-pipelines-test.yml b/azure-pipelines-test.yml
deleted file mode 100644
index e061cc8c..00000000
--- a/azure-pipelines-test.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-
-# Image tag name for Fuse projects
-#parameters:
-#- name: imagetag
-#  displayName: Image tag to be built and/or deployed
-#  type: string
-#  default: latest
-
-resources:
-  repositories:
-  # Azure DevOps repository
-  - repository: infofinland-pipelines
-    type: git
-    # Azure DevOps project/repository
-    name: infofinland/infofinland-pipelines
-
-extends:
-  # Filename in Azure DevOps Repository (note possible -ui or -api)
-  # Django example: azure-pipelines-PROJECTNAME-api-master.yml
-  # Drupal example: azure-pipelines-drupal-master.yml
-  template: azure-pipelines-infofinland-drupal-test.yml@infofinland-pipelines
-  # Image tag name for Fuse projects
-  #parameters:
-    #imagetag: ${{ parameters.imagetag }}
diff --git a/pipelines/infofinland-drupal-production.yml b/pipelines/infofinland-drupal-production.yml
new file mode 100644
index 00000000..9f351b7d
--- /dev/null
+++ b/pipelines/infofinland-drupal-production.yml
@@ -0,0 +1,37 @@
+# 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
+
+# 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: infofinland-pipelines
+      type: git
+      # Azure DevOps project/repository
+      name: infofinland/infofinland-pipelines
+
+extends:
+  # Filename in Azure DevOps Repository
+  template: components/infofinland-drupal/pipelines/infofinland-drupal-production.yml@infofinland-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 infofinland-pipelines
+    # The values here will override the values defined in the infofinland-pipelines repository
+    # buildArgs:
+    #   DEBUG: 1
+    # configMap: # pod environment variables
+    #   DEBUG: 1
diff --git a/pipelines/infofinland-drupal-staging.yml b/pipelines/infofinland-drupal-staging.yml
new file mode 100644
index 00000000..87ea48d8
--- /dev/null
+++ b/pipelines/infofinland-drupal-staging.yml
@@ -0,0 +1,47 @@
+# 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/infofinland-drupal-production.yml'
+    - 'pipelines/infofinland-drupal-test.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: infofinland-pipelines
+      type: git
+      # Azure DevOps project/repository
+      name: infofinland/infofinland-pipelines
+
+extends:
+  # Filename in Azure DevOps Repository
+  template: components/infofinland-drupal/pipelines/infofinland-drupal-staging.yml@infofinland-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 infofinland-pipelines
+    # The values here will override the values defined in the infofinland-pipelines repository
+    # buildArgs:
+    #   DEBUG: 1
+    # configMap: # pod environment variables
+    #   DEBUG: 1
diff --git a/pipelines/infofinland-drupal-test.yml b/pipelines/infofinland-drupal-test.yml
new file mode 100644
index 00000000..1e8891ac
--- /dev/null
+++ b/pipelines/infofinland-drupal-test.yml
@@ -0,0 +1,47 @@
+# 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/infofinland-drupal-production.yml'
+    - 'pipelines/infofinland-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: infofinland-pipelines
+      type: git
+      # Azure DevOps project/repository
+      name: infofinland/infofinland-pipelines
+
+extends:
+  # Filename in Azure DevOps Repository
+  template: components/infofinland-drupal/pipelines/infofinland-drupal-test.yml@infofinland-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 infofinland-pipelines
+    # The values here will override the values defined in the infofinland-pipelines repository
+    # buildArgs:
+    #   DEBUG: 1
+    # configMap: # pod environment variables
+    #   DEBUG: 1