diff --git a/.github/workflows/ci-merge-request.yml b/.github/workflows/ci-merge-request.yml
new file mode 100644
index 00000000..a4a9cab6
--- /dev/null
+++ b/.github/workflows/ci-merge-request.yml
@@ -0,0 +1,54 @@
+
+name: CI on Pull Request
+
+on:
+  pull_request:
+    branches:
+      - main
+    types: [opened, synchronize, reopened]
+
+jobs:
+  frontend:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: npm ci
+        working-directory: ./frontend
+
+      - name: Build React app
+        run: npm run build
+        working-directory: ./frontend
+
+      - name: Run lint
+        run: npm run lint
+        working-directory: ./frontend
+
+  backend:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9.0.x'
+
+      - name: Restore dependencies
+        run: dotnet restore
+        working-directory: ./backend
+
+      - name: Build backend in Release
+        run: dotnet build -c Release --no-restore
+        working-directory: ./backend
+
diff --git a/.github/workflows/deploy-infra-and-apps.yml b/.github/workflows/deploy-infra-and-apps.yml
new file mode 100644
index 00000000..46e1b533
--- /dev/null
+++ b/.github/workflows/deploy-infra-and-apps.yml
@@ -0,0 +1,114 @@
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+  workflow_dispatch:
+
+ 
+permissions:
+  id-token: write        
+
+env: 
+  AZURE_RG_NAME: rg-${{ vars.PROJECT_NAME }}-${{ vars.AZURE_RESOURCE_IDENTIFIER }}
+
+jobs:
+  deploy_infrastructure:
+    runs-on: ubuntu-latest
+    environment: production
+
+    outputs:
+      appServiceName: ${{ steps.bicep_deploy.outputs.appServiceName }}
+      staticWebAppName: ${{ steps.bicep_deploy.outputs.staticWebAppName }}
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Login to Azure 
+      uses: azure/login@v2
+      with:
+        client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+        enable-AzPSSession: true 
+
+    - name: Create resource group if not exists      
+      run: |
+        az group show --name ${{ env.AZURE_RG_NAME }} ||
+        az group create --name ${{ env.AZURE_RG_NAME }} --location ${{ secrets.AZURE_REGION }}
+
+    - name: Deploy bicep
+      id: bicep_deploy
+      uses: azure/arm-deploy@v2
+      with:
+        subscriptionId: ${{ secrets.AZURE_SUBSCRIPTION }}
+        region: ${{ secrets.AZURE_REGION }}
+        template: ./infrastructure/main.bicep
+        parameters: project=${{ vars.PROJECT_NAME }} location=${{ secrets.AZURE_REGION }} swaLocation=${{ secrets.AZURE_SWA_REGION }} identifier=${{ vars.AZURE_RESOURCE_IDENTIFIER }}
+        resourceGroupName: ${{ env.AZURE_RG_NAME }}
+
+
+  deploy_backend:
+          runs-on: ubuntu-latest
+          needs: deploy_infrastructure
+          environment: production
+
+          steps:
+          - name: Checkout repository
+            uses: actions/checkout@v4
+          
+          - name: Setup .NET SDK 9.0.x
+            uses: actions/setup-dotnet@v4
+            with:
+              dotnet-version: '9.0.x'
+              
+          - name: Publish the app
+            run: dotnet publish -c Release --property:PublishDir=publish # Publish the app to the API project publish folder
+            working-directory: ./backend # Specify where to find the solution file in repository
+
+          - name: Login to Azure 
+            uses: azure/login@v2
+            with:
+              client-id: ${{ secrets.AZURE_CLIENT_ID }}
+              tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+              subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+            
+          - name: Deploy backend to App Service
+            uses: azure/webapps-deploy@v2
+            with: 
+              app-name: ${{ needs.deploy_infrastructure.outputs.appServiceName }} # Access to the previous job output to get the appServiceName deployed with bicep
+              package: ./backend/ParkNDeploy.Api/publish # Path to the previously published app
+
+  deploy_frontend:
+      runs-on: ubuntu-latest
+      needs: deploy_infrastructure
+      environment: production
+
+      steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Build the app
+        run: npm install && npm run build
+        working-directory: ./frontend    
+
+      - name: Login to Azure 
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} 
+
+      - name: Get Static Web App deployment token
+        run: |      
+            SWA_DEPLOYMENT_TOKEN=$(az staticwebapp secrets list -n ${{ needs.deploy_infrastructure.outputs.staticWebAppName }} -o tsv --query properties.apiKey)
+            echo SWA_DEPLOYMENT_TOKEN=$SWA_DEPLOYMENT_TOKEN >> $GITHUB_ENV
+        
+      - name: Deploy frontend to Static Web App
+        uses: azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ env.SWA_DEPLOYMENT_TOKEN }}
+          app_location: frontend/dist
+          action: upload
+          skip_app_build: true
+          skip_api_build: true
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..2ba986f6
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index fec8c8e5..6de0d4b9 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -3,6 +3,7 @@
   "references": [
     { "path": "./tsconfig.app.json" },
     { "path": "./tsconfig.node.json" }
+        // { "path": "./tsconfig.node.json" }
   ],
   "compilerOptions": {
     "baseUrl": ".",
diff --git a/infrastructure/main.bicep b/infrastructure/main.bicep
new file mode 100644
index 00000000..9c52dd00
--- /dev/null
+++ b/infrastructure/main.bicep
@@ -0,0 +1,54 @@
+targetScope = 'resourceGroup' // We'll deploy the resources in the provided resource g
+
+// Parameters to easily construct resource names
+param location string
+param project string
+
+// Here we'll add an identifier to create a unique name for the App Service Plan, for example your trigram, so that everyone could deploy his own parkndeploy instance
+param identifier string
+param swaLocation string // Static Web App locations are limited, we need to add another variable
+
+// Create the AppServicePlan through the AppServicePlan module
+module appServicePlan 'modules/appServicePlan.bicep' = {
+  name: 'appServicePlan'
+  params: {
+    location: location
+    project: project
+    identifier: identifier
+  }
+}
+
+// Create the AppService through the AppService module
+module appService 'modules/appService.bicep' = {
+  name: 'appService'
+  params: {
+    location: location
+    project: project
+    identifier: identifier
+    planId: appServicePlan.outputs.planId // Use the appServicePlan output to get its id back => an App Service needs to reference its App Service Plan
+  }
+}
+
+
+
+
+module staticWebApp 'modules/staticWebApp.bicep' = {
+  name: 'staticWebApp'
+  params: {
+    location: swaLocation
+    project: project
+    identifier: identifier
+  }
+}
+
+module staticWebAppBackend 'modules/staticWebAppBackend.bicep' = {
+  name: 'staticWebAppBackend'
+  params: {
+    backendBindedResourceId: appService.outputs.appServiceId
+    swaName: staticWebApp.outputs.swaName
+    location: location
+  }
+}
+
+output appServiceName string = appService.outputs.appServiceName // Export AppServiceName in order to deploy the API later on
+output staticWebAppName string = staticWebApp.outputs.swaName // Export StaticWebAppName in order to deploy the Frontend late
diff --git a/infrastructure/modules/appService.bicep b/infrastructure/modules/appService.bicep
new file mode 100644
index 00000000..c0e5d89c
--- /dev/null
+++ b/infrastructure/modules/appService.bicep
@@ -0,0 +1,23 @@
+param location string
+param project string
+param identifier string
+
+// App Service Plan identifier that will host our App Servi
+param planId string
+
+resource app 'Microsoft.Web/sites@2022-03-01' = {
+  name: '${project}-app-${identifier}'
+  location: location
+
+  properties: {
+    serverFarmId: planId
+    reserved: true
+
+    siteConfig: {
+      linuxFxVersion: 'DOTNETCORE|9.0' // Specify to setup t .NET Core 9.0 runtime (used by our backend API) on the Linux machine under the hood
+    }
+  }
+}
+
+output appServiceName string = app.name // Export the App Service name for deployment
+output appServiceId string = app.id
diff --git a/infrastructure/modules/appServicePlan.bicep b/infrastructure/modules/appServicePlan.bicep
new file mode 100644
index 00000000..c871995f
--- /dev/null
+++ b/infrastructure/modules/appServicePlan.bicep
@@ -0,0 +1,20 @@
+param location string
+param project string
+param identifier string
+
+resource plan 'Microsoft.Web/serverfarms@2022-09-01' = {
+  name: '${project}-plan-${identifier}'
+  location: location
+  
+  sku: {
+    name: 'F1' // We use F1 pricing plan (free one) as we don't need specific features
+  }
+  
+  kind: 'app,linux' // Allow to deploy on an App Service using Linux OS
+  
+  properties: {
+    reserved: true // Specifity of App Service with Linux OS
+  }
+}
+
+output planId string = plan.id // Export the App Service identifier
\ No newline at end of file
diff --git a/infrastructure/modules/staticWebApp.bicep b/infrastructure/modules/staticWebApp.bicep
new file mode 100644
index 00000000..672a6365
--- /dev/null
+++ b/infrastructure/modules/staticWebApp.bicep
@@ -0,0 +1,19 @@
+param location string
+param project string
+
+// Here we'll use add an identifier to create a unique name for the App Service Plan, for example your trigram, so that everyone could deploy his own parkndeploy instance
+param identifier string
+
+resource swa 'Microsoft.Web/staticSites@2024-04-01' = {
+  name: '${project}-swa-${identifier}'
+  location: location
+  
+  sku: {
+    name: 'Standard'
+    tier: 'Standard'
+  }  
+
+  properties: {} // even empty, it's mandatory ...
+}
+
+output swaName string = swa.name
diff --git a/infrastructure/modules/staticWebAppBackend.bicep b/infrastructure/modules/staticWebAppBackend.bicep
new file mode 100644
index 00000000..4e902770
--- /dev/null
+++ b/infrastructure/modules/staticWebAppBackend.bicep
@@ -0,0 +1,11 @@
+param backendBindedResourceId string
+param swaName string
+param location string
+
+resource staticWebAppBackend 'Microsoft.Web/staticSites/linkedBackends@2022-03-01' = {
+  name: '${swaName}/backend'
+  properties: {
+    backendResourceId: backendBindedResourceId
+    region: location
+  }
+}