diff --git a/binary_sensor.yaml b/binary_sensor.yaml
new file mode 100644
index 00000000..183e19c2
--- /dev/null
+++ b/binary_sensor.yaml
@@ -0,0 +1,4 @@
+- platform: workday
+    name: workday
+    country: DE
+    province: HE
\ No newline at end of file
diff --git a/configuration.yaml b/configuration.yaml
index bf34d5a3..c139d5ad 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -124,4 +124,5 @@ image_processing: !include image_processing.yaml
 android_ip_webcam: !include android_ip_webcam.yaml
 history_graph: !include history_graph.yaml
 input_select: !include input_select.yaml
-input_datetime: !include input_datetime.yaml
\ No newline at end of file
+input_datetime: !include input_datetime.yaml
+binary_sensor: !include binary_sensor.yaml
\ No newline at end of file
diff --git a/group.yaml b/group.yaml
index dc97a16d..e042d346 100644
--- a/group.yaml
+++ b/group.yaml
@@ -358,8 +358,12 @@ current_commit:
     - sensor.current_commit_name
 alarm:
   name: Wecker
-  entities:
-    - input_datetime.alarm
+  entities: 
+    - sensor.alarm_time
+    - input_number.alarmhour
+    - input_number.alarmminutes
+    - input_boolean.wakemeup
+    - input_boolean.alarmweekday
 #################################################################
 ## Synonym
 #################################################################
diff --git a/input_boolean.yaml b/input_boolean.yaml
index 7cd11bf8..266af867 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -18,4 +18,10 @@
   room_based_light:
     icon: mdi:lightbulb
   heading_home_notifier_user_one:
-    icon: mdi:telegram
\ No newline at end of file
+    icon: mdi:telegram
+  alarmweekday:
+    name: Nur an Arbeitstagen
+    icon: mdi:calendar
+  wakemeup:
+    name: Weck mich
+    icon: mdi:alarm-check
\ No newline at end of file
diff --git a/input_number.yaml b/input_number.yaml
index 4fb344de..a1fde19e 100644
--- a/input_number.yaml
+++ b/input_number.yaml
@@ -2,4 +2,16 @@ leave_time_offset:
   name: Extra Zeit
   min: 0
   max: 60
-  step: 1
\ No newline at end of file
+  step: 1
+alarmhour:
+  name: Stunde
+  icon: mdi:timer
+  min: 0
+  max: 23
+  step: 1
+alarmminutes:
+  name: Minute
+  icon: mdi:timer
+  min: 0
+  max: 59
+  step: 5
\ No newline at end of file
diff --git a/sensor.yaml b/sensor.yaml
index 9802c2c7..87745484 100644
--- a/sensor.yaml
+++ b/sensor.yaml
@@ -428,4 +428,12 @@
       value_template: "{{states.sensor.current_commit.state.split(' ',1)[0]}}"
     current_commit_name:
       friendly_name: Message
-      value_template: "{{states.sensor.current_commit.state.split(' ',1)[1]}}"
\ No newline at end of file
+      value_template: "{{states.sensor.current_commit.state.split(' ',1)[1]}}"
+#################################################################
+## Alarm Clock
+#################################################################
+- platform: template
+  sensors:
+    alarm_time:
+      friendly_name: 'Uhrzeit'
+      value_template: '{{ "%0.02d:%0.02d" | format(states("input_number.alarmhour") | int, states("input_number.alarmminutes") | int) }}'
\ No newline at end of file