diff --git a/etc/azure/deploy-to-k8s.yml b/etc/azure/deploy-to-k8s.yml
index 80a69bf..92373ce 100644
--- a/etc/azure/deploy-to-k8s.yml
+++ b/etc/azure/deploy-to-k8s.yml
@@ -49,8 +49,6 @@ steps:
 
 - task: HelmDeploy@0
   displayName: Helm deploy
-  condition: 
-  timeoutInMinutes: 20
   inputs:
     connectionType: 'Azure Resource Manager'
     azureSubscription: 'volosoft(fe02ef9f-9e1c-4e40-b924-505981688dd8)'
@@ -63,4 +61,4 @@ steps:
     chartName: 'etc/k8s/helm-chart/eventhub'
     releaseName: 'eh-az'
     valueFile: 'etc/k8s/helm-chart/eventhub/values.azure.yaml'
-    arguments: '--namespace eventhub --create-namespace --set global.eventHubImageVersion=$(version)'
\ No newline at end of file
+    arguments: '--timeout 20m --namespace eventhub --create-namespace --set global.eventHubImageVersion=$(version)'
\ No newline at end of file
diff --git a/src/EventHub.Admin.HttpApi.Host/Dockerfile b/src/EventHub.Admin.HttpApi.Host/Dockerfile
index 23cf8a0..b272c02 100644
--- a/src/EventHub.Admin.HttpApi.Host/Dockerfile
+++ b/src/EventHub.Admin.HttpApi.Host/Dockerfile
@@ -1,4 +1,4 @@
-  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
+  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
   COPY bin/Release/net6.0/publish/ app/
   WORKDIR /app
   ENTRYPOINT ["dotnet", "EventHub.Admin.HttpApi.Host.dll"]
\ No newline at end of file
diff --git a/src/EventHub.BackgroundServices/Dockerfile b/src/EventHub.BackgroundServices/Dockerfile
index 88992dc..44ae845 100644
--- a/src/EventHub.BackgroundServices/Dockerfile
+++ b/src/EventHub.BackgroundServices/Dockerfile
@@ -1,4 +1,4 @@
-  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
+  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
   COPY bin/Release/net6.0/ app/
   WORKDIR /app
   ENTRYPOINT ["dotnet", "EventHub.BackgroundServices.dll"]
\ No newline at end of file
diff --git a/src/EventHub.DbMigrator/Dockerfile b/src/EventHub.DbMigrator/Dockerfile
index 5e73e2c..243948f 100644
--- a/src/EventHub.DbMigrator/Dockerfile
+++ b/src/EventHub.DbMigrator/Dockerfile
@@ -1,4 +1,4 @@
-  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
+  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
   COPY bin/Release/net6.0/ app/
   WORKDIR /app
   ENTRYPOINT ["dotnet", "EventHub.DbMigrator.dll"]
\ No newline at end of file
diff --git a/src/EventHub.HttpApi.Host/Dockerfile b/src/EventHub.HttpApi.Host/Dockerfile
index a462475..422bbcb 100644
--- a/src/EventHub.HttpApi.Host/Dockerfile
+++ b/src/EventHub.HttpApi.Host/Dockerfile
@@ -1,4 +1,4 @@
-  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
+  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
   COPY bin/Release/net6.0/publish/ app/
   WORKDIR /app
   ENTRYPOINT ["dotnet", "EventHub.HttpApi.Host.dll"]
\ No newline at end of file
diff --git a/src/EventHub.IdentityServer/Dockerfile b/src/EventHub.IdentityServer/Dockerfile
index d497dc7..407859c 100644
--- a/src/EventHub.IdentityServer/Dockerfile
+++ b/src/EventHub.IdentityServer/Dockerfile
@@ -1,4 +1,4 @@
-  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
+  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
   COPY bin/Release/net6.0/publish/ app/
   WORKDIR /app
   ENTRYPOINT ["dotnet", "EventHub.IdentityServer.dll"]
\ No newline at end of file
diff --git a/src/EventHub.Web/Dockerfile b/src/EventHub.Web/Dockerfile
index f960f8a..dd7a0d8 100644
--- a/src/EventHub.Web/Dockerfile
+++ b/src/EventHub.Web/Dockerfile
@@ -1,4 +1,4 @@
-  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-rc.2-bullseye-slim
+  FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim
   COPY bin/Release/net6.0/publish/ app/
   WORKDIR /app
   ENTRYPOINT ["dotnet", "EventHub.Web.dll"]
\ No newline at end of file