diff --git a/.github/workflows/bikes.yml b/.github/workflows/bikes.yml
index a91930850..b979050cd 100644
--- a/.github/workflows/bikes.yml
+++ b/.github/workflows/bikes.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
     
     - uses: actions/checkout@master
@@ -48,12 +48,11 @@ jobs:
         
     - name: Helm Install PR
       run: |
+        helm init --upgrade --wait
         helm upgrade --install --namespace $GITHUB_HEAD_REF bikesharing-$GITHUB_HEAD_REF samples/BikeSharingApp/Bikes/charts/bikes \
           --set image.repository=${{ secrets.CONTAINER_REGISTRY }}/bikes \
           --set image.tag=$GITHUB_SHA \
-          --set imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
-          --set ingress.hosts[0]=$GITHUB_HEAD_REF.s.${{ secrets.MASTER_SPACE }}.bikesharing.${{ secrets.HOST_SUFFIX }} \
-          --set ingress.annotations.kubernetes\\.io/ingress\\.class=traefik-azds
+          --set imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }}
  
     - uses: azure/dev-spaces/actions/add-review-url@Releases/v1              
       with:
diff --git a/.github/workflows/bikesharing.yml b/.github/workflows/bikesharing.yml
index b1615bc02..03ee165a2 100644
--- a/.github/workflows/bikesharing.yml
+++ b/.github/workflows/bikesharing.yml
@@ -10,7 +10,7 @@ on:
     
 jobs:
   build:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     steps:
     
     - uses: actions/checkout@master
@@ -61,6 +61,7 @@ jobs:
         cd samples/BikeSharingApp/charts
         helm init --client-only
         helm dependency update
+        helm init --upgrade --wait
         helm upgrade --install --namespace ${{ secrets.MASTER_SPACE }} bikesharing . \
           --set bikes.image.repository=${{ secrets.CONTAINER_REGISTRY }}/bikes \
           --set bikes.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
@@ -76,7 +77,7 @@ jobs:
           --set gateway.image.repository=${{ secrets.CONTAINER_REGISTRY }}/gateway \
           --set gateway.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \
           --set gateway.image.tag=$GITHUB_SHA \
-          --set gateway.ingress.hosts[0]=${{ secrets.HOST }} \
+          --set gateway.ingress.hosts[0]=${{ secrets.MASTER_SPACE }}.gateway.${{ secrets.HOST_SUFFIX }} \
           --set gateway.ingress.annotations.kubernetes\\.io/ingress\\.class=traefik-azds \
           --set reservation.image.repository=${{ secrets.CONTAINER_REGISTRY }}/reservation \
           --set reservation.imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }} \