diff --git a/.github/workflows/dotnet-deploy-1.yml b/.github/workflows/dotnet-deploy-1.yml
index e5214a41..1831f263 100644
--- a/.github/workflows/dotnet-deploy-1.yml
+++ b/.github/workflows/dotnet-deploy-1.yml
@@ -1,23 +1,19 @@
-name: .NET CI
-
-env:
-  registryName: mpplabajep.azurecr.io
-  repositoryName: techexcel/dotnetcoreapp
-  dockerFolderPath: ./src/Application/src/RazorPagesTestSample
-  tag: ${{github.run_number}}
-  
+name: .NET CI/CD
+
 on:
   push:
     branches: [ main ]
-    paths: src/Application/**
+    paths: 
+      - src/Application/**
   pull_request:
     branches: [ main ]
-    paths: src/Application/**
+    paths: 
+      - src/Application/**
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
@@ -25,39 +21,51 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0
-    
+        dotnet-version: '8.0.x'
+   
     - name: Restore dependencies
-      run: dotnet restore ./src/Application/src/RazorPagesTestSample/RazorPagesTestSample.csproj
+      run: dotnet restore src/Application/src/RazorPagesTestSample/RazorPagesTestSample.csproj
     - name: Build
-      run: dotnet build --no-restore ./src/Application/src/RazorPagesTestSample/RazorPagesTestSample.csproj
+      run: dotnet build --no-restore src/Application/src/RazorPagesTestSample/RazorPagesTestSample.csproj
     - name: Test
-      run: dotnet test --no-build --verbosity normal ./src/Application/tests/RazorPagesTestSample.Tests/RazorPagesTestSample.Tests.csproj
-      
-  dockerBuildPush:
-    
+      run: dotnet test --no-build --verbosity normal src/Application/tests/RazorPagesTestSample.Tests/RazorPagesTestSample.Tests.csproj
+
+  deploy-to-test:
     runs-on: ubuntu-latest
     needs: build
+    environment:
+      name: test
+      url: https://mpplabajep-test.azurewebsites.net/
 
     steps:
     - uses: actions/checkout@v3
     
-    - name: Docker Login
-      # You may pin to the exact commit or the version.
-      # uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
-      uses: docker/login-action@v1.9.0
+    - name: 'Login via Azure CLI'
+      uses: azure/login@v2.1.1
+      with:
+        creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+    - uses: azure/webapps-deploy@v2
+      with:
+        app-name: 'mpplabajep-test'
+        images: mpplabajep.azurecr.io/techexcel/dotnetcoreapp:${{github.run_number}}
+
+  deploy-to-prod:
+    runs-on: ubuntu-latest
+    needs: deploy-to-test
+    environment:
+      name: prod
+      url: https://mpplabajep-prod.azurewebsites.net/
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: 'Login via Azure CLI'
+      uses: azure/login@v2.1.1
+      with:
+        creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+    - uses: azure/webapps-deploy@v2
       with:
-        # Server address of Docker registry. If not set then will default to Docker Hub
-        registry: ${{ secrets.ACR_LOGIN_SERVER }}
-        # Username used to log against the Docker registry
-        username: ${{ secrets.ACR_USERNAME }}
-        # Password or personal access token used to log against the Docker registry
-        password: ${{ secrets.ACR_PASSWORD }}
-        # Log out from the Docker registry at the end of a job
-        logout: true
-        
-    - name: Docker Build
-      run: docker build -t $registryName/$repositoryName:$tag --build-arg build_version=$tag $dockerFolderPath
-      
-    - name: Docker Push
-      run: docker push $registryName/$repositoryName:$tag
\ No newline at end of file
+        app-name: 'mpplabajep-prod'
+        images: mpplabajep.azurecr.io/techexcel/dotnetcoreapp:${{github.run_number}}
\ No newline at end of file
diff --git a/src/Application/src/RazorPagesTestSample/Pages/Error.cshtml b/src/Application/src/RazorPagesTestSample/Pages/Error.cshtml
index 6f92b956..b34f2566 100644
--- a/src/Application/src/RazorPagesTestSample/Pages/Error.cshtml
+++ b/src/Application/src/RazorPagesTestSample/Pages/Error.cshtml
@@ -5,7 +5,7 @@
 }
 
 <h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
+<h3 class="text-danger">An error occurred while processing your request.</h3>
 
 @if (Model.ShowRequestId)
 {