diff --git a/Hub/Service/azure-pipelines.yml b/Hub/Service/deploy/azure-pipelines.yml
similarity index 67%
rename from Hub/Service/azure-pipelines.yml
rename to Hub/Service/deploy/azure-pipelines.yml
index 7120787..8b9168f 100644
--- a/Hub/Service/azure-pipelines.yml
+++ b/Hub/Service/deploy/azure-pipelines.yml
@@ -29,4 +29,15 @@ steps:
     dockerRegistryConnection: 'Docker Hub'
     action: 'Push an image'
     imageName: 'ckaczor/home-monitor-hub-service:$(Build.BuildNumber)'
-    includeLatestTag: true
\ No newline at end of file
+    includeLatestTag: true
+
+- task: Bash@3
+  inputs:
+    targetType: 'inline'
+    script: 'sed -i s/#BUILD_BUILDNUMBER#/$BUILD_BUILDNUMBER/ Hub/Service/deploy/manifest.yaml'
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: 'Hub/Service/deploy/manifest.yaml'
+    ArtifactName: 'Manifest'
+    publishLocation: 'Container'    
\ No newline at end of file
diff --git a/Hub/Service/deploy/service.yaml b/Hub/Service/deploy/manifest.yaml
similarity index 90%
rename from Hub/Service/deploy/service.yaml
rename to Hub/Service/deploy/manifest.yaml
index 38bf8ef..268e47a 100644
--- a/Hub/Service/deploy/service.yaml
+++ b/Hub/Service/deploy/manifest.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: hub-service
-        image: ckaczor/home-monitor-hub-service:latest
+        image: ckaczor/home-monitor-hub-service:#BUILD_BUILDNUMBER#
         terminationMessagePath: "/dev/termination-log"
         terminationMessagePolicy: File
         imagePullPolicy: Always