diff --git a/shortcuts/matterhorn-helper.sh b/shortcuts/matterhorn-helper.sh
new file mode 100755
index 0000000..8e3be58
--- /dev/null
+++ b/shortcuts/matterhorn-helper.sh
@@ -0,0 +1,32 @@
+#! /usr/bin/env sh
+
+TZ=${TZ:-Europe/Berlin}
+
+CONFIG_FILE_VOLUME=""
+CONTAINER_NAME_PARAM=""
+while [ $# -gt 0 ]
+do
+  case $1 in
+    -c|--config)
+      shift
+      CONFIG_FILE_VOLUME="-v $1:/etc/matterhorn/config.ini"
+      ;;
+    -n|--name)
+      shift
+      CONTAINER_NAME_PARAM="--name $1"
+      ;;
+    *)
+      >2 echo "Unknown parameter $1"
+  esac
+  shift
+done
+
+/usr/bin/docker run -it --rm \
+                    $CONTAINER_NAME_PARAM \
+                    $CONFIG_FILE_VOLUME \
+                    -e TZ \
+                    `# Add notification support` \
+                    -e DBUS_SESSION_BUS_ADDRESS \
+                    -v "$(echo $DBUS_SESSION_BUS_ADDRESS | cut -d= -f2):$(echo $DBUS_SESSION_BUS_ADDRESS | cut -d= -f2)" \
+                    -u $(id -u) \
+                    bennyli/matterhorn
diff --git a/shortcuts/matterhorn-iteratec b/shortcuts/matterhorn-iteratec
index a7cce10..35ba46f 100755
--- a/shortcuts/matterhorn-iteratec
+++ b/shortcuts/matterhorn-iteratec
@@ -1,3 +1,4 @@
 #! /usr/bin/env sh
 
-/usr/bin/termite --title="Mattermost iteratec" --exec='sh -c "/usr/bin/docker run -it --rm -e TZ=Europe/Berlin -v ~/.config/matterhorn/config-iteratec.ini:/etc/matterhorn/config.ini bennyli/matterhorn"'
+/usr/bin/alacritty --title "Mattermost iteratec" \
+                   --command /bin/sh -c "~/.dotfiles/shortcuts/matterhorn-helper.sh --config ~/.config/matterhorn/config-iteratec.ini --name matterhorn-iteratec" 
diff --git a/shortcuts/matterhorn-iteratec-hh b/shortcuts/matterhorn-iteratec-hh
index fcac515..42732ff 100755
--- a/shortcuts/matterhorn-iteratec-hh
+++ b/shortcuts/matterhorn-iteratec-hh
@@ -1,3 +1,4 @@
 #! /usr/bin/env sh
 
-/usr/bin/termite --title="Mattermost Hamburg" --exec='sh -c "/usr/bin/docker run -it --rm -e TZ=Europe/Berlin -v ~/.config/matterhorn/config-iteratec-hh.ini:/etc/matterhorn/config.ini bennyli/matterhorn"'
+/usr/bin/alacritty --title "Mattermost Hamburg" \
+                   --command /bin/sh -c "~/.dotfiles/shortcuts/matterhorn-helper.sh --config ~/.config/matterhorn/config-iteratec-hh.ini --name matterhorn-iteratec-hh" 
diff --git a/shortcuts/matterhorn-iteratec-osm b/shortcuts/matterhorn-iteratec-osm
index d1f47fc..a5cb3f4 100755
--- a/shortcuts/matterhorn-iteratec-osm
+++ b/shortcuts/matterhorn-iteratec-osm
@@ -1,3 +1,4 @@
 #! /usr/bin/env sh
 
-/usr/bin/termite --title="Mattermost OSM" --exec='sh -c "/usr/bin/docker run -it --rm -e TZ=Europe/Berlin -v ~/.config/matterhorn/config-iteratec-osm.ini:/etc/matterhorn/config.ini bennyli/matterhorn"'
+/usr/bin/alacritty --title "Mattermost OSM" \
+                   --command /bin/sh -c "~/.dotfiles/shortcuts/matterhorn-helper.sh --config ~/.config/matterhorn/config-iteratec-osm.ini --name matterhorn-iteratec-osm"