diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index db64c7d59..e001e517b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -11,7 +11,7 @@ jobs:
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
-  - template: ci/docker.yml
+  - template: azure-pipelines/docker.yml
     parameters:
       imageName: 'libgit2/trusty-openssl:latest'
       environmentVariables: |
@@ -24,7 +24,7 @@ jobs:
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
-  - template: ci/docker.yml
+  - template: azure-pipelines/docker.yml
     parameters:
       imageName: 'libgit2/trusty-mbedtls:latest'
       environmentVariables: |
@@ -37,7 +37,7 @@ jobs:
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
-  - template: ci/docker.yml
+  - template: azure-pipelines/docker.yml
     parameters:
       imageName: 'libgit2/trusty-openssl:latest'
       environmentVariables: |
@@ -50,7 +50,7 @@ jobs:
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
-  - template: ci/docker.yml
+  - template: azure-pipelines/docker.yml
     parameters:
       imageName: 'libgit2/trusty-mbedtls:latest'
       environmentVariables: |
@@ -65,7 +65,7 @@ jobs:
   steps:
   - bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
     displayName: Setup
-  - template: ci/bash.yml
+  - template: azure-pipelines/bash.yml
     parameters:
       environmentVariables:
         TMPDIR: $(Agent.TempDirectory)
@@ -77,7 +77,7 @@ jobs:
   displayName: 'Windows (Visual Studio; amd64)'
   pool: Hosted
   steps:
-  - template: ci/powershell.yml
+  - template: azure-pipelines/powershell.yml
     parameters:
       environmentVariables:
         CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64"
@@ -86,7 +86,7 @@ jobs:
   displayName: 'Windows (Visual Studio; x86)'
   pool: Hosted
   steps:
-  - template: ci/powershell.yml
+  - template: azure-pipelines/powershell.yml
     parameters:
       environmentVariables:
         CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013"
@@ -100,7 +100,7 @@ jobs:
     env:
       TEMP: $(Agent.TempDirectory)
       ARCH: amd64
-  - template: ci/powershell.yml
+  - template: azure-pipelines/powershell.yml
     parameters:
       environmentVariables:
         CMAKE_OPTIONS: -G"MinGW Makefiles"
@@ -116,7 +116,7 @@ jobs:
     env:
       TEMP: $(Agent.TempDirectory)
       ARCH: x86
-  - template: ci/powershell.yml
+  - template: azure-pipelines/powershell.yml
     parameters:
       environmentVariables:
         CMAKE_OPTIONS: -G"MinGW Makefiles"
diff --git a/ci/bash.yml b/azure-pipelines/bash.yml
similarity index 100%
rename from ci/bash.yml
rename to azure-pipelines/bash.yml
diff --git a/ci/docker.yml b/azure-pipelines/docker.yml
similarity index 100%
rename from ci/docker.yml
rename to azure-pipelines/docker.yml
diff --git a/ci/nightly.yml b/azure-pipelines/nightly.yml
similarity index 100%
rename from ci/nightly.yml
rename to azure-pipelines/nightly.yml
diff --git a/ci/powershell.yml b/azure-pipelines/powershell.yml
similarity index 100%
rename from ci/powershell.yml
rename to azure-pipelines/powershell.yml