diff --git a/.github/workflows/bikes.yml b/.github/workflows/bikes.yml
index c7172f44d..1c17b4a47 100644
--- a/.github/workflows/bikes.yml
+++ b/.github/workflows/bikes.yml
@@ -23,7 +23,7 @@ jobs:
         docker build samples/BikeSharingApp/Bikes/ -t ${{ secrets.CONTAINER_REGISTRY }}/bikes:$GITHUB_SHA
         docker push ${{ secrets.CONTAINER_REGISTRY }}/bikes:$GITHUB_SHA
       
-    - uses: azure/k8s-actions/aks-set-context@master
+    - uses: azure/aks-set-context@v1
       with:
         creds: '${{ secrets.AZURE_CREDENTIALS }}'
         cluster-name: ${{ secrets.CLUSTER_NAME }}
@@ -45,7 +45,7 @@ jobs:
           azds.io/space=true \
           azds.io/pull-request-space=true
         
-    - uses: azure/k8s-actions/k8s-create-secret@master
+    - uses: azure/k8s-create-secret@v1
       with:
         namespace: ${{ steps.generate-child-space-name.outputs.result }}
         container-registry-url: ${{ secrets.CONTAINER_REGISTRY }}
diff --git a/.github/workflows/bikesharing.yml b/.github/workflows/bikesharing.yml
index 03ee165a2..bd1cd05e1 100644
--- a/.github/workflows/bikesharing.yml
+++ b/.github/workflows/bikesharing.yml
@@ -15,7 +15,7 @@ jobs:
     
     - uses: actions/checkout@master
     
-    - uses: azure/container-actions/docker-login@master
+    - uses: azure/docker-login@v1
       with:
         login-server: ${{ secrets.CONTAINER_REGISTRY }}
         username: ${{ secrets.REGISTRY_USERNAME }}
@@ -43,12 +43,13 @@ jobs:
         docker build samples/BikeSharingApp/Users/ -t ${{ secrets.CONTAINER_REGISTRY }}/users:$GITHUB_SHA
         docker push ${{ secrets.CONTAINER_REGISTRY }}/users:$GITHUB_SHA
       
-    - uses: azure/k8s-actions/aks-set-context@master
+    - uses: azure/aks-set-context@v1
       with:
         creds: '${{ secrets.AZURE_CREDENTIALS }}'
         cluster-name: ${{ secrets.CLUSTER_NAME }}
         resource-group: ${{ secrets.RESOURCE_GROUP }}
-    - uses: azure/k8s-actions/k8s-create-secret@master
+
+    - uses: azure/k8s-create-secret@v1
       with:
         namespace: ${{ secrets.MASTER_SPACE }}
         container-registry-url: ${{ secrets.CONTAINER_REGISTRY }}
diff --git a/.github/workflows/pullrequest.yml.template b/.github/workflows/pullrequest.yml.template
index 364ac7137..b8be47a83 100644
--- a/.github/workflows/pullrequest.yml.template
+++ b/.github/workflows/pullrequest.yml.template
@@ -41,7 +41,7 @@ jobs:
         docker build <PATH_TO_THE_DOCKERFILE>/ -t ${{ secrets.CONTAINER_REGISTRY }}/<NAME_OF_THE_SERVICE>:$GITHUB_SHA
         docker push ${{ secrets.CONTAINER_REGISTRY }}/<NAME_OF_THE_SERVICE>:$GITHUB_SHA
       
-    - uses: azure/k8s-actions/aks-set-context@master
+    - uses: azure/aks-set-context@v1
       with:
         creds: '${{ secrets.AZURE_CREDENTIALS }}'
         cluster-name: ${{ secrets.CLUSTER_NAME }}
@@ -63,7 +63,7 @@ jobs:
           azds.io/space=true \
           azds.io/pull-request-space=true
         
-    - uses: azure/k8s-actions/k8s-create-secret@master
+    - uses: azure/k8s-create-secret@v1
       with:
         namespace: ${{ steps.generate-child-space-name.outputs.result }}
         container-registry-url: ${{ secrets.CONTAINER_REGISTRY }}