diff --git a/playbooks/kubernetes-install.yaml b/playbooks/kubernetes-install.yaml
index 80b40f9..3de2356 100644
--- a/playbooks/kubernetes-install.yaml
+++ b/playbooks/kubernetes-install.yaml
@@ -74,23 +74,6 @@
   roles:
     - { role: kubernetes/node/labels_taints }
 
-# Alter PostgreSQL server and add PostgreSQL databases
-- hosts: postgres
-  name: Postgres Setup - Configuration
-  become: true
-  become_user: postgres
-  roles:
-    - { role: kubernetes/database/postgres/alter_server_settings }
-    - { role: kubernetes/database/postgres/create_databases }
-
-# Restart PostgreSQL server
-- hosts: postgres
-  name: Postgres Setup - Restart
-  become: true
-  become_user: root
-  roles:
-    - { role: kubernetes/database/postgres/restart_server }
-
 # Setup default storage class for cluster
 - hosts: localhost
   name: Default Storage Class Setup
diff --git a/playbooks/systems-install.yaml b/playbooks/systems-install.yaml
index a1b2f4e..8084145 100644
--- a/playbooks/systems-install.yaml
+++ b/playbooks/systems-install.yaml
@@ -33,7 +33,24 @@
   become: true
   become_user: root
   roles:
-    - { role: systems/postgres }
+    - { role: systems/postgres/install }
+
+# Alter PostgreSQL server and add PostgreSQL databases
+- hosts: postgres
+  name: Postgres Setup - Configuration
+  become: true
+  become_user: postgres
+  roles:
+    - { role: systems/postgres/alter_server_settings }
+    - { role: systems/postgres/create_databases }
+
+# Restart PostgreSQL server
+- hosts: postgres
+  name: Postgres Setup - Restart
+  become: true
+  become_user: root
+  roles:
+    - { role: systems/postgres/restart_server }
 
 # Container Registry Server
 - hosts: cr
diff --git a/roles/kubernetes/database/postgres/alter_server_settings/defaults/main.yaml b/roles/systems/postgres/alter_server_settings/defaults/main.yaml
similarity index 100%
rename from roles/kubernetes/database/postgres/alter_server_settings/defaults/main.yaml
rename to roles/systems/postgres/alter_server_settings/defaults/main.yaml
diff --git a/roles/kubernetes/database/postgres/alter_server_settings/tasks/main.yaml b/roles/systems/postgres/alter_server_settings/tasks/main.yaml
similarity index 100%
rename from roles/kubernetes/database/postgres/alter_server_settings/tasks/main.yaml
rename to roles/systems/postgres/alter_server_settings/tasks/main.yaml
diff --git a/roles/kubernetes/database/postgres/create_databases/tasks/main.yaml b/roles/systems/postgres/create_databases/tasks/main.yaml
similarity index 100%
rename from roles/kubernetes/database/postgres/create_databases/tasks/main.yaml
rename to roles/systems/postgres/create_databases/tasks/main.yaml
diff --git a/roles/systems/postgres/defaults/main.yaml b/roles/systems/postgres/install/defaults/main.yaml
similarity index 100%
rename from roles/systems/postgres/defaults/main.yaml
rename to roles/systems/postgres/install/defaults/main.yaml
diff --git a/roles/systems/postgres/tasks/main.yaml b/roles/systems/postgres/install/tasks/main.yaml
similarity index 100%
rename from roles/systems/postgres/tasks/main.yaml
rename to roles/systems/postgres/install/tasks/main.yaml
diff --git a/roles/kubernetes/database/postgres/restart_server/tasks/main.yaml b/roles/systems/postgres/restart_server/tasks/main.yaml
similarity index 100%
rename from roles/kubernetes/database/postgres/restart_server/tasks/main.yaml
rename to roles/systems/postgres/restart_server/tasks/main.yaml