diff --git a/.github/workflows/ci-cd-main.yml b/.github/workflows/ci-cd-main.yml
index a04be99a9..369290770 100644
--- a/.github/workflows/ci-cd-main.yml
+++ b/.github/workflows/ci-cd-main.yml
@@ -89,6 +89,7 @@ jobs:
         publish,
         deploy-infra-test,
       ]
+    # we want deployment of apps to be dependent on deployment of infrastructure, but if infrastructure is skipped, we still want to deploy the apps
     if: ${{ always() && !failure() && !cancelled() && needs.check-for-changes.outputs.hasBackendChanges == 'true' }}
     uses: ./.github/workflows/action-deploy-apps.yml
     secrets:
diff --git a/.github/workflows/ci-cd-staging.yml b/.github/workflows/ci-cd-staging.yml
index a9d92a864..7c33213b3 100644
--- a/.github/workflows/ci-cd-staging.yml
+++ b/.github/workflows/ci-cd-staging.yml
@@ -50,6 +50,7 @@ jobs:
     name: Deploy apps to staging
     needs:
       [get-current-version, check-for-changes, deploy-infra-staging, publish]
+    # we want deployment of apps to be dependent on deployment of infrastructure, but if infrastructure is skipped, we still want to deploy the apps
     if: ${{ always() && !failure() && !cancelled() && needs.check-for-changes.outputs.hasBackendChanges == 'true' }}
     uses: ./.github/workflows/action-deploy-apps.yml
     secrets:
diff --git a/README.md b/README.md
index 4f725f0f7..40cd9b336 100644
--- a/README.md
+++ b/README.md
@@ -107,3 +107,48 @@ We are able to toggle some external resources in local development. This is done
 }
 ```
 Toggling these flags will enable/disable the external resources. The `DisableAuth` flag, for example, will disable authentication in the WebAPI project. This is useful when debugging the WebAPI project in an IDE. These settings will only be respected in the `Development` environment.
+
+## Deployment
+
+This repository contains code for both infrastructure and applications. Configurations for infrastructure is located in `.azure/infrastructure`. Application configuration is in `.azure/applications`. 
+
+### Deployment process
+
+Deployments are done using `Github Actions` with the following process:
+
+![Deployment process](docs/deploy-process.png)
+
+[Release Please](https://github.com/google-github-actions/release-please-action) is used in order to create releases, generate changelog and bumping version numbers.
+
+`CHANGELOG.md` and `version.txt` are automatically updated and should not be changed manually.
+
+### Github actions
+
+Naming conventions for github actions:
+- `action-*.yml`: Reusable workflows
+- `ci-cd-*.yml`: Workflows that are triggered by an event
+- `dispatch-*.yml`: Workflows that are dispatchable
+
+The `action-check-for-changes.yml` workflow uses the `tj-actions/changed-files` action to check which files have been altered since last commit or tag. We use this filter to ensure we only deploy backend code or infrastructure if the respective files have been altered. 
+
+### Infrastructure
+
+Infrastructure definitions for the project are located in the `.azure/infrastructure` folder. To add new infrastructure components, follow the existing pattern found within this directory. This involves creating new Bicep files or modifying existing ones to define the necessary infrastructure resources.
+
+For example, to add a new storage account, you would:
+- Create or update a Bicep file within the `.azure/infrastructure` folder to include the storage account resource definition.
+- Ensure that the Bicep file is referenced correctly in `.azure/infrastructure/infrastructure.bicep` to be included in the deployment process.
+
+Refer to the existing infrastructure definitions as templates for creating new components.
+
+### Applications
+
+All application Bicep definitions are located in the `.azure/applications` folder. To add a new application, follow the existing pattern found within this directory. This involves creating a new folder for your application under `.azure/applications` and adding the necessary Bicep files (`main.bicep` and environment-specific parameter files, e.g., `test.bicepparam`, `staging.bicepparam`).
+
+For example, to add a new application named `web-api-new`, you would:
+- Create a new folder: `.azure/applications/web-api-new`
+- Add a `main.bicep` file within this folder to define the application's infrastructure.
+- Use the appropriate `Bicep`-modules within this file. There is one for `Container apps` which you most likely would use.
+- Add parameter files for each environment (e.g., `test.bicepparam`, `staging.bicepparam`) to specify environment-specific values.
+
+Refer to the existing applications like `web-api-so` and `web-api-eu` as templates.
diff --git a/docs/Configuration.md b/docs/Configuration.md
index a3f17f07b..8be379b20 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -61,20 +61,24 @@ The auto generated secrets will not have to be handled or known by anyone other
 ## 3.1. How to
 **TODO: Kan vi bruke miljøets KV direkte som cache?**
 
-Modifying autogenerated secrets is a multi step process involving altering the bootstrap powershell script, and the bicep scripts. 
+Modifying autogenerated secrets is a multi step process. 
 
 To add and use the new secret:
-1. Add a new key value pair to `parameters.secrets.value` in [deploy.Bicep.ps1](../.azure/deployBicep.ps1), for example `myShinyNewPassword`:
-    ```powershell
-    # Add auto generated secrets to parameters
-    AddMemberPath $paramsJson "parameters.secrets.value" @{
-        dialogportenPgAdminPassword = (GeneratePassword -length 30).Password,
-        # Add the new password
-        myShinyNewPassword = (GeneratePassword -length 30).Password
-    }
+1. Generate the secret in gh action, like we do for the postgresql password:
+    ```yml
+    ...
+      - name: Generate postgresql password
+        id: pwd-generator
+        shell: pwsh
+        run: |
+          Import-module "./.github/tools/pwdGenerator.ps1" -Force
+          $password = (GeneratePassword -length 30).Password
+          echo "::add-mask::$password"
+          echo "::set-output name=postgresqlPassword::$password"
+    ...
     ```
-    The new `myShinyNewPassword` will be available in [main.bicep](../.azure/main.bicep) through `secrets.myShinyNewPassword`. However, this password will be different every time the IaC runs which is why we don't want to use this value directly. The bicep module **MODULE NAME HERE** will add `myShinyNewPassword` to the specific environments key vault if it does not already exist.
-2. Use the secret by fetching it from the environment key vault `envKeyVault.getSecret('myShinyNewPassword')`.
+    Pass the password as parameter to the deployment step. In the case of the posgresql password, this password will be different every time the IaC runs which is why we don't want to use this value directly. The bicep module **postgreSql** will add `postgresqlPassword` to the specific environments key vault if it does not already exist.
+2. Use the secret by fetching it from the environment key vault `envKeyVault.getSecret('postgresqlPassword')`.
 
 Removing or modifying autogenerated secrets is not supported through IaC.
 
diff --git a/docs/deploy-process.png b/docs/deploy-process.png
new file mode 100644
index 000000000..0a631b0d0
Binary files /dev/null and b/docs/deploy-process.png differ