diff --git a/tasks/main.yml b/tasks/main.yml
index f29509e01386cfc760030203fb17d833020438d6..30cd2c7e27546cd21fbe1b44c09aff643089a4d3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -4,45 +4,52 @@
 ---
 # file: roles/uptime/tasks/main.yml
 
-- name: "Ensure uptime user"
-  mongodb_user:
-    database=uptime
-    login_database=admin
-    login_user=root
-    login_password=root
-    name=root
-    password=root
-
-- name: "Ensure directory"
-  file:
-    path='/var/www'
-    state=directory
-    mode=0755
-
-- name: "Checkout latest version of Uptime"
-  git:
-    repo='https://gitlab.paragon-es.de/tools/uptime.git'
-    dest='/var/www/uptime'
-
-- name: "Install node components"
-  npm:
-    path='/var/www/uptime'
-
-- name: "Configure uptime"
-  template:
-    src='production.yaml'
-    dest='/var/www/uptime/config/production.yaml'
-    owner=root
-    group=root
-    mode=644
-
-# Config Uptime
-# edit config/default.yml
-
-# Start uptime
-# node app
-# Production Environment
-# NODE_ENV=production node app
-
-# http://localhost:8082/
-
+- name: "Uptime Role"
+  set_fact: role_uptime_started=true
+  tags: always
+
+- block:
+
+  - name: "Ensure uptime user"
+    mongodb_user:
+      database=uptime
+      login_database=admin
+      login_user=root
+      login_password=root
+      name=root
+      password=root
+
+  - name: "Ensure directory"
+    file:
+      path='/var/www'
+      state=directory
+      mode=0755
+
+  - name: "Checkout latest version of Uptime"
+    git:
+      repo='https://gitlab.paragon-es.de/tools/uptime.git'
+      dest='/var/www/uptime'
+
+  - name: "Install node components"
+    npm:
+      path='/var/www/uptime'
+
+  - name: "Configure uptime"
+    template:
+      src='production.yaml'
+      dest='/var/www/uptime/config/production.yaml'
+      owner=root
+      group=root
+      mode=644
+
+  # Config Uptime
+  # edit config/default.yml
+
+  # Start uptime
+  # node app
+  # Production Environment
+  # NODE_ENV=production node app
+
+  # http://localhost:8082/
+
+  when: '"uptime" not in excluded_roles'