diff --git a/src/EventHub.HttpApi.Host/Dockerfile b/Dockerfile.EventHub.HttpApi.Host
similarity index 100%
rename from src/EventHub.HttpApi.Host/Dockerfile
rename to Dockerfile.EventHub.HttpApi.Host
diff --git a/src/EventHub.IdentityServer/Dockerfile b/Dockerfile.EventHub.IdentityServer
similarity index 100%
rename from src/EventHub.IdentityServer/Dockerfile
rename to Dockerfile.EventHub.IdentityServer
diff --git a/azure-pipelines.eventhub.httpapi.host.yml b/azure-pipelines.eventhub.httpapi.host.yml
new file mode 100644
index 0000000..62aa9a4
--- /dev/null
+++ b/azure-pipelines.eventhub.httpapi.host.yml
@@ -0,0 +1,69 @@
+# Deploy to Azure Kubernetes Service
+# Build and push image to Azure Container Registry; Deploy to Azure Kubernetes Service
+# https://docs.microsoft.com/azure/devops/pipelines/languages/docker
+
+trigger:
+- dev
+
+
+variables:
+
+  # Container registry service connection established during pipeline creation
+  dockerRegistryServiceConnection: '9a6341b6-70a5-4ee7-b7a2-5efa6d4f0fe3'
+  imageRepository: 'voloeventhubhttpapihost'
+  containerRegistry: 'voloeventhubhttpapihost.azurecr.io'
+  dockerfilePath: '**/Dockerfile.EventHub.Web'
+  tag: '$(Build.BuildNumber)'
+
+  # Agent VM image name
+  vmImageName: 'ubuntu-latest'
+
+
+stages:
+- stage: Build
+  displayName: Build stage
+  jobs:
+  - job: Build
+    displayName: Build
+    pool:
+      vmImage: $(vmImageName)
+    steps:
+    - task: Docker@2
+      displayName: Build and push an image to container registry
+      inputs:
+        command: buildAndPush
+        repository: $(imageRepository)
+        dockerfile: $(dockerfilePath)
+        containerRegistry: $(dockerRegistryServiceConnection)
+        tags: |
+          $(tag)
+
+    - publish: manifests
+      artifact: manifests
+
+- stage: Deploy
+  displayName: Deploy stage
+  dependsOn: Build
+
+  jobs:
+  - deployment: Deploy
+    displayName: Deploy-EventHub.Web
+    pool:
+      vmImage: $(vmImageName)
+    environment: 'volosofteventhub-5982.default'
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+
+
+          - task: KubernetesManifest@0
+            displayName: Deploy to Kubernetes cluster
+            inputs:
+              action: deploy
+              manifests: |
+                $(Pipeline.Workspace)/manifests/deployment.eventhub.web.yml
+                $(Pipeline.Workspace)/manifests/service.eventhub.web.yml
+              containers: |
+                $(containerRegistry)/$(imageRepository):$(tag)
+
diff --git a/azure-pipelines.eventhub.identityserver.yml b/azure-pipelines.eventhub.identityserver.yml
new file mode 100644
index 0000000..adf2a1b
--- /dev/null
+++ b/azure-pipelines.eventhub.identityserver.yml
@@ -0,0 +1,69 @@
+# Deploy to Azure Kubernetes Service
+# Build and push image to Azure Container Registry; Deploy to Azure Kubernetes Service
+# https://docs.microsoft.com/azure/devops/pipelines/languages/docker
+
+trigger:
+- dev
+
+
+variables:
+
+  # Container registry service connection established during pipeline creation
+  dockerRegistryServiceConnection: '9a6341b6-70a5-4ee7-b7a2-5efa6d4f0fe3'
+  imageRepository: 'volosofteventhub'
+  containerRegistry: 'voloeventhub.azurecr.io'
+  dockerfilePath: '**/Dockerfile.EventHub.IdentityServer'
+  tag: '$(Build.BuildNumber)'
+
+  # Agent VM image name
+  vmImageName: 'ubuntu-latest'
+
+
+stages:
+- stage: Build
+  displayName: Build stage
+  jobs:
+  - job: Build
+    displayName: Build
+    pool:
+      vmImage: $(vmImageName)
+    steps:
+    - task: Docker@2
+      displayName: Build and push an image to container registry
+      inputs:
+        command: buildAndPush
+        repository: $(imageRepository)
+        dockerfile: $(dockerfilePath)
+        containerRegistry: $(dockerRegistryServiceConnection)
+        tags: |
+          $(tag)
+
+    - publish: manifests
+      artifact: manifests
+
+- stage: Deploy
+  displayName: Deploy stage
+  dependsOn: Build
+
+  jobs:
+  - deployment: Deploy
+    displayName: Deploy-EventHub.Web
+    pool:
+      vmImage: $(vmImageName)
+    environment: 'volosofteventhub-5982.default'
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+
+
+          - task: KubernetesManifest@0
+            displayName: Deploy to Kubernetes cluster
+            inputs:
+              action: deploy
+              manifests: |
+                $(Pipeline.Workspace)/manifests/deployment.eventhub.identityserver.yml
+                $(Pipeline.Workspace)/manifests/service.eventhub.identityserver.yml
+              containers: |
+                $(containerRegistry)/$(imageRepository):$(tag)
+
diff --git a/src/EventHub.IdentityServer/.dockerignore b/src/EventHub.IdentityServer/.dockerignore
deleted file mode 100644
index dbb5e63..0000000
--- a/src/EventHub.IdentityServer/.dockerignore
+++ /dev/null
@@ -1,15 +0,0 @@
-node_modules
-npm-debug.log
-Dockerfile*
-docker-compose*
-.dockerignore
-.git
-.gitignore
-.env
-*/bin
-*/obj
-bin
-obj
-README.md
-LICENSE
-.vscode
\ No newline at end of file