diff --git a/README.md b/README.md
index 2eab463..8a2c0e7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # execDAT
 
-execDAT - remote code execution for research
+execDAT - remote code execution for research 
 
 ## Getting Started
 
diff --git a/docs/adrs/2023-03-16-public-vs-private-data.md b/docs/adrs/2023-03-16-public-vs-private-data.md
index c58aed6..b10e381 100644
--- a/docs/adrs/2023-03-16-public-vs-private-data.md
+++ b/docs/adrs/2023-03-16-public-vs-private-data.md
@@ -3,7 +3,7 @@
 Date: 2023-03-16
 
 ## Status
-__PROPOSED__
+__ACCEPTED__
 
 ## Context
 
diff --git a/docs/adrs/2023-03-23-branch-naming.md b/docs/adrs/2023-03-23-branch-naming.md
new file mode 100644
index 0000000..9a577f3
--- /dev/null
+++ b/docs/adrs/2023-03-23-branch-naming.md
@@ -0,0 +1,25 @@
+# Branch Naming
+
+Date: 2023-03-23
+
+## Status
+__PROPOSED__
+
+## Context
+We want a unified naming scheme for the naming of branches. Currently, no concrete scheme was decided on and we had a discussion between `feature/`, `features/` and `issue/` prefixes for branches beside `dev` or `main`.
+
+## Decision
+We decided on the following namings:
+* `main` for the main branch
+* `dev` for the development branch
+* `feature/` for all branches that implement a new functionality or feature
+* `issue/` for all branches that are concerned with a bug-fixe or issue
+* `testing/` for all branches that fit neither `feature/` or `issue/`
+
+We researched Pre-Commit-Hooks to enforce this, however a local installation of the CLI tool would be required and we do not want the added tool requirements and complexity.
+
+Instead we will use the __branch protection rules__ to pattern match all other names and lock the corresponding branches. This should correspond some type of enforcing.
+
+## Consequences
+* developers need to adhere to the naming scheme for branches
+* tighter control over the branch protection rules because we only have a small set of legal names
\ No newline at end of file
diff --git a/docs/adrs/2023-03-23-cicd-solution.md b/docs/adrs/2023-03-23-cicd-solution.md
new file mode 100644
index 0000000..03da31d
--- /dev/null
+++ b/docs/adrs/2023-03-23-cicd-solution.md
@@ -0,0 +1,19 @@
+# Title
+
+Date: 2023-03-23
+
+## Status
+
+__PROPOSED__
+
+## Context
+
+We need to dicide on a CI/CD solution for our project, so we can automate certain tasks, e.g., building, testing, releasing, etc..
+
+## Decision
+
+Some choices for our CICD platform would be GitHub Actions, Tekton, Jenkins or Argo CD. Solutions like Tekton or Argo CD are build up upon Kubernetes, are cloud-native and platform agnostic. GitHub Actions workflows are much simpler, have predefined workflow steps and only require a yaml file for configuration. We decided to use GitHub Actions workflows because we already use GitHub for other related tasks, such as branch naming and protection rules, and therfore we have all of our configuration in one place. Additionally, GitHub Actions are much easier to setup and there are many already existing yaml configurations we can build up upon.
+
+## Consequences
+
+By choosing GitHub Action workflows, compared to running custom workflows in a Kubernetes environment with other solutions, we have a much simpler setup. But we are also more limited in our possibilities, as you have more options in a custom Kubernetes cluster.
diff --git a/docs/adrs/2023-03-DD-cicd-solution.md b/docs/adrs/2023-03-DD-cicd-solution.md
deleted file mode 100644
index 2c75292..0000000
--- a/docs/adrs/2023-03-DD-cicd-solution.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Title
-
-Date: YYYY-MM-DD
-
-## Status
-
-What is the status if the ADR?
-
-Possible options:
-* __PROPOSED__
-* __ACCEPTED__
-* __REJECTED__
-* __DEPRECATED__ (include reference to the superseding ADR)
-* __SUPERSEDED__ (include reference to the deprecating ADR)
-
-## Context
-
-What is the context of this ADR? What is the issue that we are seeing? What is motivating this decision or change?
-
-## Decision
-
-What is the change we are proposing? What do we plan on doing to solve the issue?
-
-## Consequences
-
-What are the consequences of the change? What will be more difficult? What will be easier?
\ No newline at end of file