diff --git a/roles/mastodon/tasks/system_setup/base_packages.yml b/roles/mastodon/tasks/system_setup/base_packages.yml
new file mode 100644
index 0000000..7e5ab0b
--- /dev/null
+++ b/roles/mastodon/tasks/system_setup/base_packages.yml
@@ -0,0 +1,10 @@
+---
+
+- name: mastodon | Install base packages
+  package:
+    name: "{{ item.package }}"
+    update_cache: yes
+    cache_valid_time: 3600
+    state: latest
+    install_recommends: no
+  with_items: "{{ packages1 }}"
\ No newline at end of file
diff --git a/roles/mastodon/tasks/system_setup/packages.yml b/roles/mastodon/tasks/system_setup/packages.yml
index a82bf3e..20e9c34 100644
--- a/roles/mastodon/tasks/system_setup/packages.yml
+++ b/roles/mastodon/tasks/system_setup/packages.yml
@@ -7,7 +7,7 @@
     cache_valid_time: 3600
     state: latest
     install_recommends: no
-  with_items: "{{ packages }}"
+  with_items: "{{ packages2 }}"
 
 - name: mastodon | nodejs alternative
   alternatives:
diff --git a/roles/mastodon/vars/Debian.yml b/roles/mastodon/vars/Debian.yml
index 09a5a2a..82a40d6 100644
--- a/roles/mastodon/vars/Debian.yml
+++ b/roles/mastodon/vars/Debian.yml
@@ -1,6 +1,14 @@
 mastodon_db_login_unix_socket: '/var/run/postgresql'
 
-packages:
+packages1:
+  - package: "curl"
+  - package: "wget"
+  - package: "gnupg"
+  - package: "apt-transport-https"
+  - package: "lsb-release"
+  - package: "ca-certificates"
+
+packages2:
   - package: "apt-transport-https"
   - package: "autoconf"
   - package: "bison"
@@ -12,17 +20,18 @@ packages:
   - package: "file"
   - package: "g++"
   - package: "gcc"
-  - package: "git"
+  - package: "git-core"
   - package: "gnupg"
   - package: "imagemagick"
   - package: "libffi-dev"
   - package: "libgdbm-dev"
   - package: "libicu-dev"
   - package: "libidn11-dev"
+  - package: "libjemalloc-dev"
   - package: "libncurses5-dev"
   - package: "libpq-dev"
   - package: "libprotobuf-dev"
-  - package: "libreadline-dev"
+  - package: "libreadline6-dev"
   - package: "libssl-dev"
   - package: "libxml2-dev"
   - package: "libxslt1-dev"
@@ -31,6 +40,9 @@ packages:
   - package: "nodejs"
   - package: "pkg-config"
   - package: "protobuf-compiler"
+  - package: "redis-server"
+  - package: "redis-tools"
+  - package: "postgresql-contrib"
   - package: "sudo"
   - package: "systemd"
   - package: "wget"
diff --git a/roles/mastodon/vars/Ubuntu.yml b/roles/mastodon/vars/Ubuntu.yml
index 09a5a2a..82a40d6 100644
--- a/roles/mastodon/vars/Ubuntu.yml
+++ b/roles/mastodon/vars/Ubuntu.yml
@@ -1,6 +1,14 @@
 mastodon_db_login_unix_socket: '/var/run/postgresql'
 
-packages:
+packages1:
+  - package: "curl"
+  - package: "wget"
+  - package: "gnupg"
+  - package: "apt-transport-https"
+  - package: "lsb-release"
+  - package: "ca-certificates"
+
+packages2:
   - package: "apt-transport-https"
   - package: "autoconf"
   - package: "bison"
@@ -12,17 +20,18 @@ packages:
   - package: "file"
   - package: "g++"
   - package: "gcc"
-  - package: "git"
+  - package: "git-core"
   - package: "gnupg"
   - package: "imagemagick"
   - package: "libffi-dev"
   - package: "libgdbm-dev"
   - package: "libicu-dev"
   - package: "libidn11-dev"
+  - package: "libjemalloc-dev"
   - package: "libncurses5-dev"
   - package: "libpq-dev"
   - package: "libprotobuf-dev"
-  - package: "libreadline-dev"
+  - package: "libreadline6-dev"
   - package: "libssl-dev"
   - package: "libxml2-dev"
   - package: "libxslt1-dev"
@@ -31,6 +40,9 @@ packages:
   - package: "nodejs"
   - package: "pkg-config"
   - package: "protobuf-compiler"
+  - package: "redis-server"
+  - package: "redis-tools"
+  - package: "postgresql-contrib"
   - package: "sudo"
   - package: "systemd"
   - package: "wget"