diff --git a/roles/deployment/databases/tasks/postgresql.yml b/roles/deployment/databases/tasks/postgresql.yml
index 84e81913..eb9793a7 100644
--- a/roles/deployment/databases/tasks/postgresql.yml
+++ b/roles/deployment/databases/tasks/postgresql.yml
@@ -14,14 +14,6 @@
 
 ---
 
-- name: Ensure psycopg2 is installed
-  package:
-    name: "{{ ((hostvars[item]['ansible_os_family'] == 'RedHat') and (hostvars[item]['ansible_distribution_major_version'] == '7')) | ternary('python-psycopg2', 'python3-psycopg2') }}"
-  with_items: "{{ databases | json_query('*.host') | unique }}"
-  delegate_to: "{{ item }}"
-  connection: ssh
-  when: item in groups.db_server
-
 - name: Create database roles
   postgresql_user:
     name: "{{ databases[item].user }}"
diff --git a/roles/infrastructure/krb5_client/tasks/freeipa.yml b/roles/infrastructure/krb5_client/tasks/freeipa.yml
index 7097e9a9..5e1326f5 100644
--- a/roles/infrastructure/krb5_client/tasks/freeipa.yml
+++ b/roles/infrastructure/krb5_client/tasks/freeipa.yml
@@ -30,6 +30,7 @@
     ipaserver_realm: "{{ krb5_realm }}"
     ipaserver_domain: "{{ krb5_domain | default(krb5_realm | lower) }}"
     ipaclient_servers: "{{ groups['krb5_server'] }}"
+  when: "krb5_kdc_type == 'Red Hat IPA' and 'krb5_server' in groups"
 
 - name: Include Private Cloud config changes
   ansible.builtin.include_tasks: pvc_configs.yml