diff --git a/README.rst b/README.rst
index e77f3d98d7ef22cb26ff0fbe8deeb01b88178da1..dc438654892263210ee0cb99e83d7411b5e2a4b6 100644
--- a/README.rst
+++ b/README.rst
@@ -37,23 +37,20 @@ Configures development tools (includes the desktop and packages playbooks).
 Skype
 =====
 
-Installs the Skype Debian package since there's no repository.
+Install Skype flatpak from flathub..
 
 .. code:: shell
 
     ansible-playbook --ask-become-pass --connection local --inventory-file localhost, --verbose skype.yml
 
-Can be added as a Cron job under root for updates.
-
-.. code:: shell
-
-    ansible-playbook --connection local --inventory-file localhost, --verbose skype.yml | logger
+Slack
+=====
 
-Or maybe even (always downloads the newest version from the Git repo).
+Install Slack desktop flatpak from flathub..
 
 .. code:: shell
 
-    ansible-pull --url https://www.shore.co.il/git/ansible-desktop-playbooks --verbose skype.yml | logger
+    ansible-playbook --ask-become-pass --connection local --inventory-file localhost, --verbose slack.yml
 
 Dropbox
 =======
diff --git a/skype.yml b/skype.yml
index 0a94a961048c7dbbb1874130042c15d6fdd7b3d5..4dc83b294ac21edb14891da6d811bc725d37a86c 100644
--- a/skype.yml
+++ b/skype.yml
@@ -16,10 +16,16 @@
             update_cache: yes
             cache_valid_time: 3600
 
+      - name: Add Flathub repo
+        become: False
+        command: |
+            flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo --user
+        changed_when: False
+
       - name: Install
         become: False
         command: |
-            flatpak install --user --from https://s3.amazonaws.com/alexlarsson/skype-repo/skype.flatpakref
+            flatpak install --user flathub com.skype.Client
         register: skype_flatpak_install
         changed_when: |
             'Installing' in skype_flatpak_install.stdout
diff --git a/slack.yml b/slack.yml
new file mode 100644
index 0000000000000000000000000000000000000000..5da56993a0b461d9c10982ebcc136e63e96da924
--- /dev/null
+++ b/slack.yml
@@ -0,0 +1,32 @@
+---
+- hosts: all
+  become: yes
+  become_user: root
+  tasks:
+      - name: Assertions
+        assert:
+          that:
+              - ansible_architecture in [ 'x86_64', 'x86' ]
+              - ansible_pkg_mgr == 'apt'
+
+      - name: APT install Flatpak
+        apt:
+            name: flatpak
+            state: present
+            update_cache: yes
+            cache_valid_time: 3600
+
+      - name: Add Flathub repo
+        become: False
+        command: |
+            flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo --user
+        changed_when: False
+
+      - name: Install
+        become: False
+        command: |
+            flatpak install --user flathub com.slack.Slack
+        register: slack_flatpak_install
+        changed_when: |
+            'Installing' in slack_flatpak_install.stdout
+        failed_when: slack_flatpak_install.rc|int > 0 and 'already installed' not in slack_flatpak_install.stderr