diff --git a/roles/postgres/defaults/main.yaml b/roles/postgres/defaults/main.yaml
index b2ccf71..589867a 100644
--- a/roles/postgres/defaults/main.yaml
+++ b/roles/postgres/defaults/main.yaml
@@ -1,3 +1,6 @@
+postgres_enabled: true
+postgres_operator_enabled: true
+postgres_operator_ui_enabled: true
 postgres_operator_chart_ref: "ghp/postgres-operator"
 postgres_operator_ui_chart_ref: "ghp/postgres-operator-ui"
 postgres_operator_ui_short_name: "postgres-operator-ui"
@@ -64,6 +67,7 @@ postgres_db_definitions:
         roundcube: []
         harbor: []
         mastodon: []
+        keycloak: []
       databases:
         gitea: gitea
         bitwarden: bitwarden
@@ -75,6 +79,7 @@ postgres_db_definitions:
         harbor_notary_server: harbor
         harbor_notary_signer: harbor
         mastodon: mastodon
+        keycloak: keycloak
       preparedDatabases:
         peertube:
           defaultUsers: true
diff --git a/roles/postgres/tasks/main.yaml b/roles/postgres/tasks/main.yaml
index 353f741..29a8b90 100644
--- a/roles/postgres/tasks/main.yaml
+++ b/roles/postgres/tasks/main.yaml
@@ -44,6 +44,7 @@
 
 - set_fact:
     postgres_operator_combined_values: "{{ postgres_operator_default_values | combine(postgres_operator_values, recursive=true) }}"
+  when: postgres_operator_enabled
 
 - name: Deploy Postgres Operator
   kubernetes.core.helm:
@@ -54,9 +55,11 @@
     chart_version: "{{ postgres_operator_version | default(omit) }}"
     release_values: "{{ postgres_operator_combined_values | from_yaml }}"
     wait: true
+  when: postgres_operator_enabled
 
 - set_fact:
     postgres_operator_ui_combined_values: "{{ postgres_operator_ui_default_values | combine(postgres_operator_ui_values, recursive=true) }}"
+  when: postgres_operator_ui_enabled
 
 - name: Deploy Postgres Operator UI
   kubernetes.core.helm:
@@ -67,6 +70,7 @@
     chart_version: "{{ postgres_operator_ui_version | default(omit) }}"
     release_values: "{{ postgres_operator_ui_combined_values | from_yaml }}"
     wait: true
+  when: postgres_operator_ui_enabled
 
 - name: Create Postgres databases
   k8s: