diff --git a/README.md b/README.md
index 96ed3b1..576254f 100644
--- a/README.md
+++ b/README.md
@@ -201,6 +201,10 @@ This will open your default editor allowing you to edit the docker system units
 
 ``` conf
 [Service]
+
+Environment=http_proxy=
+Environment=https_proxy=
+
 Environment=HOSTIP=
 Environment=HOST=
 Environment=HTTP_PROXY_USER=
diff --git a/ccp/docker-compose.yml b/ccp/docker-compose.yml
index 3607efa..99e82eb 100644
--- a/ccp/docker-compose.yml
+++ b/ccp/docker-compose.yml
@@ -78,7 +78,7 @@ services:
     environment:
       APP_BASE_URL: "http://dktk-fed-search-share:8080"
       APP_BROKER_BASEURL: "https://dktk-fed-search.verbis.dkfz.de/broker/rest/searchbroker"
-      APP_BROKER_MAIL: "foo@bar.de"
+      APP_BROKER_MAIL: ${CCP_MAIL}
       APP_STORE_BASEURL: "http://bridgehead-ccp-blaze:8080/fhir"
       SPRING_DATASOURCE_URL: "jdbc:postgresql://bridgehead-ccp-share-db:5432/dktk-fed-search-share"
       JAVA_TOOL_OPTIONS: "-Xmx1g"
diff --git a/landing/index.html b/landing/index.html
deleted file mode 100644
index 73d2113..0000000
--- a/landing/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="description" content="">
-  <title>Bridgehead Overview</title>
-  <!-- Bootstrap core CSS -->
-  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
-    integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
-    integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
-    crossorigin="anonymous"></script>
-
-</head>
-
-<body>
-
-  <nav class="navbar navbar-light" style="background-color: #aad7f6;">
-    <h2 class="pb-2 border-bottom">Bridgehead </h2>
-  </nav>
-  <div class="container px-4 py-5" id="featured-3">
-    <div>
-      <h2>Components</h2>
-      <h3>Central</h3>
-      <table class="table">
-        <thead class="thead-dark">
-          <tr>
-            <th style="width: 50%">Group</th>
-            <th style="width: 50%">Service</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://patientlist.ccp-it.dktk.dkfz.de">Zentrale Patientenliste</td>
-          </tr>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://decentralsearch.ccp-it.dktk.dkfz.de">Dezentrale Suche</td>
-          </tr>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://centralsearch.ccp-it.dktk.dkfz.de">Zentrale Suche</td>
-          </tr>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://deployment.ccp-it.dktk.dkfz.de">Deployment-Server</td>
-          </tr>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://dktk-kne.kgu.de">Zentraler Kontrollnummernerzeuger</td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-
-    <div>
-      <h3>Local</h3>
-      <table class="table">
-        <thead class="thead-dark">
-          <tr>
-            <th style="width: 50%">Project</th>
-            <th style="width: 50%">Services</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>Bridgehead</td>
-            <td>Reverse Proxy <a href="https://e260-serv-05/dashboard/">Traefik</a></td>
-          </tr>
-          <tr>
-            <td>DKTK</td>
-            <td><a href="https://e260-serv-05/dktk-localdatamanagement/fhir/">Blaze</a></td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <footer class="footer mt-auto py-3 ">
-     <a href="https://dktk.dkfz.de/"><img src="https://www.oncoray.de/fileadmin/files/bilder_gruppen/DKTK/Logo_DKTK_neu_2016.jpg" height="10%" width="30%"></a> DKTK 2022
-    </footer>
-</body>
-
-</html>
diff --git a/lib/add_bc_user.sh b/lib/add_bc_user.sh
index 924f2e1..1adca14 100755
--- a/lib/add_bc_user.sh
+++ b/lib/add_bc_user.sh
@@ -23,7 +23,6 @@ bc=`docker run --rm -it httpd:latest htpasswd -nb $bc_user $bc_password`
 if grep -q -E "Environment=bc_auth_users=" /etc/systemd/system/bridgehead@$1.service.d/override.conf ; then
     x=`grep -E "Environment=bc_auth_users=" /etc/systemd/system/bridgehead@$1.service.d/override.conf`
     sed -i "/Environment=bc_auth_users=/c\\$x,$bc" /etc/systemd/system/bridgehead@$1.service.d/override.conf       
-
 else 
     echo "Environment=bc_auth_users=${bc}" >> /etc/systemd/system/bridgehead@$1.service.d/override.conf
 fi
\ No newline at end of file
diff --git a/lib/generate.sh b/lib/generate.sh
index 8d64d14..2d877d3 100755
--- a/lib/generate.sh
+++ b/lib/generate.sh
@@ -1,5 +1,54 @@
 #!/bin/bash
 
+if [ ! -d ./landing ]
+then 
+  mkdir landing
+fi
+
+CENTRAL_SERVICES="          <tr>
+            <td>CCP-IT</td>
+            <td><a href=\"https://monitor.vmitro.de/icingaweb2/dashboard\">Monitoring Service</td>
+          </tr>"
+
+LOCAL_SERVICES="          <tr>
+            <td>Bridgehead</td>
+            <td>Reverse Proxy <a href=\"http://${HOST}:8080/\">Traefik</a></td>
+          </tr>"
+
+if [ "$project" = "dktk" ] || [ "$project" = "c4" ] || [ "$project" = "dktk-fed" ]
+then
+    CENTRAL_SERVICES+="          <tr>
+            <td>CCP-IT</td>
+            <td><a href=\"https://patientlist.ccp-it.dktk.dkfz.de\">Zentrale Patientenliste</td>
+          </tr>
+          <tr>
+            <td>CCP-IT</td>
+            <td><a href=\"https://decentralsearch.ccp-it.dktk.dkfz.de\">Dezentrale Suche</td>
+          </tr>
+          <tr>
+            <td>CCP-IT</td>
+            <td><a href=\"https://centralsearch.ccp-it.dktk.dkfz.de\">Zentrale Suche</td>
+          </tr>
+          <tr>
+            <td>CCP-IT</td>
+            <td><a href=\"https://deployment.ccp-it.dktk.dkfz.de\">Deployment-Server</td>
+          </tr>
+          <tr>
+            <td>CCP-IT</td>
+            <td><a href=\"https://dktk-kne.kgu.de\">Zentraler Kontrollnummernerzeuger</td>
+          </tr>
+          "
+fi
+
+if [ "$project" = "dktk-fed" ]
+then 
+    LOCAL_SERVICES+="         <tr>
+            <td>DKTK</td>
+            <td><a href=\"https://${HOST}/dktk-localdatamanagement/fhir/\">Blaze</a></td>
+          </tr>
+          "
+fi
+
 cat > ./landing/index.html <<EOL
 <html lang="en">
 
@@ -17,7 +66,7 @@ cat > ./landing/index.html <<EOL
 
 </head>
 
-<body>
+<body class="d-flex flex-column min-vh-100">
 
   <nav class="navbar navbar-light" style="background-color: #aad7f6;">
     <h2 class="pb-2 border-bottom">Bridgehead ${site_name}</h2>
@@ -34,26 +83,7 @@ cat > ./landing/index.html <<EOL
           </tr>
         </thead>
         <tbody>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://patientlist.ccp-it.dktk.dkfz.de">Zentrale Patientenliste</td>
-          </tr>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://decentralsearch.ccp-it.dktk.dkfz.de">Dezentrale Suche</td>
-          </tr>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://centralsearch.ccp-it.dktk.dkfz.de">Zentrale Suche</td>
-          </tr>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://deployment.ccp-it.dktk.dkfz.de">Deployment-Server</td>
-          </tr>
-          <tr>
-            <td>CCP-IT</td>
-            <td><a href="https://dktk-kne.kgu.de">Zentraler Kontrollnummernerzeuger</td>
-          </tr>
+          ${CENTRAL_SERVICES}
         </tbody>
       </table>
     </div>
@@ -68,19 +98,12 @@ cat > ./landing/index.html <<EOL
           </tr>
         </thead>
         <tbody>
-          <tr>
-            <td>Bridgehead</td>
-            <td>Reverse Proxy <a href="https://e260-serv-05/dashboard/">Traefik</a></td>
-          </tr>
-          <tr>
-            <td>DKTK</td>
-            <td><a href="https://e260-serv-05/dktk-localdatamanagement/fhir/">Blaze</a></td>
-          </tr>
+          ${LOCAL_SERVICES}
         </tbody>
       </table>
     </div>
-    <footer class="footer mt-auto py-3 ">
-     <a href="https://dktk.dkfz.de/"><img src="https://www.oncoray.de/fileadmin/files/bilder_gruppen/DKTK/Logo_DKTK_neu_2016.jpg" height="10%" width="30%"></a> DKTK 2022
+    <footer class="footer mt-auto py-3">
+     <a href="https://dktk.dkfz.de/"><img src="https://www.oncoray.de/fileadmin/files/bilder_gruppen/DKTK/Logo_DKTK_neu_2016.jpg" style="max-width: 30%; height: auto;"></a> DKTK 2022<span style="float: right;"><a href="https://github.com/samply/bridgehead"><button type="button" class="btn btn-primary">Documentaion</button></a></span>
     </footer>
 </body>
 
diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh
index d7807db..dd56b0f 100755
--- a/lib/prerequisites.sh
+++ b/lib/prerequisites.sh
@@ -15,20 +15,20 @@ for prerequisite in $prerequisites; do
   # TODO: Check for specific version
 done
 
-echo "Checking /etc/bridgehead-config/"
+echo "Checking /etc/bridgehead/"
 
 ## Download submodule
-if [ ! -d "/etc/bridgehead-config/" ]; then
-  echo "Please set up the site-config folder. Instruction are in the readme."
+if [ ! -d "/etc/bridgehead/" ]; then
+  echo "Please set up the config folder. Instruction are in the readme."
   exit 1
 else
   echo "Done"
 fi
 
-echo "Checking /etc/bridgehead-config/site.conf"
+echo "Checking /etc/bridgehead/site.conf"
 
 #check if site.conf is created
-if [ ! -f /etc/bridgehead-config/site.conf ]; then
+if [ ! -f /etc/bridgehead/site.conf ]; then
   echo "Please create your specific site.conf file from the site.dev.conf"
   exit 1
 else
@@ -36,17 +36,17 @@ else
 fi
 
 #Load site specific variables
-source /etc/bridgehead-config/site.conf
+source /etc/bridgehead/site.conf
 
 if [ -z "$site_name" ]; then
   echo "Please set site_name"
   exit 1
 fi
 
-echo "Checking site-config module"
+echo "Checking project config"
 
 #check if project env is present
-if [ -d "/etc/bridgehead-config/${project}.env" ]; then
+if [ -d "/etc/bridgehead/${project}.env" ]; then
    echo "Please copy the tempalte from ${project} and put it in the /etc/bridgehead-config/ folder"
    exit 1
 else 
diff --git a/lib/remove-bridgehead-units.sh b/lib/remove-bridgehead-units.sh
index 877ca01..b8c34a2 100755
--- a/lib/remove-bridgehead-units.sh
+++ b/lib/remove-bridgehead-units.sh
@@ -1,8 +1,24 @@
 #!/bin/bash -e
 
-source site.conf
 source lib/functions.sh
 
+if [ $# -eq 0 ]; then
+    echo "Please provide a Project as argument"
+    exit 1
+fi
+
+if [ $1 != "ccp" ] && [ $1 != "nngm" ] && [ $1 != "gbn" ]; then
+    echo "Please provide a supported project like ccp, gbn or nngm"
+    exit 1
+fi
+
+export project=$1
+
+if ! ./lib/prerequisites.sh; then
+    log "Prerequisites failed, exiting"
+    exit 1
+fi
+
 echo "Stopping systemd services and removing bridgehead ..."
 
 systemctl disable --now bridgehead@${project}.service bridgehead-update@${project}.timer bridgehead-update@${project}.service
diff --git a/lib/setup-bridgehead-units.sh b/lib/setup-bridgehead-units.sh
index 7a6793c..7f82e2d 100755
--- a/lib/setup-bridgehead-units.sh
+++ b/lib/setup-bridgehead-units.sh
@@ -5,11 +5,22 @@ source lib/functions.sh
 
 exitIfNotRoot
 
+if [ $# -eq 0 ]; then
+    echo "Please provide a Project as argument"
+    exit 1
+fi
+
+if [ $1 != "ccp" ] && [ $1 != "nngm" ] && [ $1 != "gbn" ]; then
+    echo "Please provide a supported project like ccp, gbn or nngm"
+    exit 1
+fi
+
+export project=$1
+
 if ! ./lib/prerequisites.sh; then
     log "Prerequisites failed, exiting"
     exit 1
 fi
-source site.conf
 
 echo -e "\nInstalling systemd units ..."
 cp -v \
@@ -29,6 +40,4 @@ if ! systemctl is-active --quiet bridgehead@"${project}"; then
     systemctl enable --now bridgehead-update@"${project}".timer
 fi
 
-echo -e "\nDone - now start your bridgehead by running\n\tsystemctl start bridgehead@${project}.service\nor by rebooting your machine."
-
-# TODO: Configuration of the different modules
+echo -e "\nDone - now start your bridgehead by running\n\tsystemctl start bridgehead@${project}.service\nor by rebooting your machine."
\ No newline at end of file
diff --git a/lib/systemd/bridgehead-update@.service b/lib/systemd/bridgehead-update@.service
index b568076..770bea8 100644
--- a/lib/systemd/bridgehead-update@.service
+++ b/lib/systemd/bridgehead-update@.service
@@ -3,8 +3,10 @@ Description=Bridgehead (%i) Update Service
 
 [Service]
 Type=oneshot
+User=bridgehead
 WorkingDirectory=/srv/docker/bridgehead/
-ExecStart=/bin/bash -c "/srv/docker/bridgehead/update-bridgehead.sh %i"
+
+ExecStart=/srv/docker/bridgehead/update-bridgehead.sh %i
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/lib/systemd/bridgehead@.service b/lib/systemd/bridgehead@.service
index 8563e4f..1806cd2 100644
--- a/lib/systemd/bridgehead@.service
+++ b/lib/systemd/bridgehead@.service
@@ -2,14 +2,15 @@
 Description=Bridgehead (%i) Service
 
 [Service]
+User=bridgehead
 Restart=always
 RestartSec=30
 
 WorkingDirectory=/srv/docker/bridgehead/
 
-ExecStartPre=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env down'
-ExecStart=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env up'
-ExecStop=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env down'
+ExecStart=/srv/docker/bridgehead/start-bridgehead.sh %i
+RemainAfterExit=true
+ExecStop=/srv/docker/bridgehead/stop-bridgehead.sh %i
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/start-bridgehead.sh b/start-bridgehead.sh
index 8c44e0e..65f67ed 100755
--- a/start-bridgehead.sh
+++ b/start-bridgehead.sh
@@ -24,6 +24,6 @@ fi
 
 log "Starting bridgehead"
 
-docker-compose -f $1/docker-compose.yml --env-file /etc/bridgehead-config/$1.env up -d
+docker-compose -f $1/docker-compose.yml --env-file /etc/bridgehead/$1.env up -d
 
 log "The bridgehead should be in online in a few seconds"
diff --git a/stop-bridgehead.sh b/stop-bridgehead.sh
index 892538b..33b1e54 100755
--- a/stop-bridgehead.sh
+++ b/stop-bridgehead.sh
@@ -15,4 +15,4 @@ fi
 log "Stopping bridgehead"
 
 # TODO: Check $1 for proper values
-docker-compose -f $1/docker-compose.yml --env-file /etc/bridgehead-config/$1.env down
+docker-compose -f $1/docker-compose.yml --env-file /etc/bridgehead/$1.env down

Group	Service
CCP-IT	Zentrale Patientenliste
CCP-IT	Dezentrale Suche
CCP-IT	Zentrale Suche
CCP-IT	Deployment-Server
CCP-IT	Zentraler Kontrollnummernerzeuger