diff --git a/jira_software_server.yml b/jira_software_server.yml
index a7c1af7..f5b213f 100644
--- a/jira_software_server.yml
+++ b/jira_software_server.yml
@@ -15,6 +15,7 @@
   roles:
     - role: linux_common
     - role: aws_common
+    - role: postgres_install
     
     # - role: aws_shared_fs_config
     # - role: product_common
diff --git a/roles/postgres_install/defaults/main.yml b/roles/postgres_install/defaults/main.yml
new file mode 100644
index 0000000..9e43793
--- /dev/null
+++ b/roles/postgres_install/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+
+postgres_version: "9.6"
+postgres_version_short: "96"
diff --git a/roles/postgres_install/tasks/amazon.yml b/roles/postgres_install/tasks/amazon.yml
new file mode 100644
index 0000000..c176add
--- /dev/null
+++ b/roles/postgres_install/tasks/amazon.yml
@@ -0,0 +1,27 @@
+---
+
+- name: Add the official Postgres repo
+  yum_repository:
+    name: "postgres"
+    description: "Official PostgreSQL {{ postgres_version }}"
+    baseurl: "https://download.postgresql.org/pub/repos/yum/{{ postgres_version }}/redhat/rhel-7-x86_64"
+    gpgcheck: false
+    enabled: true
+
+- name: Install Postgres package
+  yum:
+    name:
+      - "postgresql{{ postgres_version_short }}"
+      - "postgresql{{ postgres_version_short }}-server"
+    update_cache: true
+
+- name: Initialise database
+  command:
+    cmd: "/usr/pgsql-{{ postgres_version }}/bin/postgresql{{ postgres_version_short }}-setup initdb"
+    creates: "/var/lib/pgsql/{{ postgres_version }}/data/"
+
+- name: Start Postgres server
+  service:
+    name: "postgresql-{{ postgres_version }}.service"
+    enabled: true
+    state: started
diff --git a/roles/postgres_install/tasks/main.yml b/roles/postgres_install/tasks/main.yml
new file mode 100644
index 0000000..f621910
--- /dev/null
+++ b/roles/postgres_install/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+
+- name: Install distro-specific prerequisites
+  include_tasks: "{{ ansible_distribution|lower }}.yml"