diff --git a/roles/postgresql/tasks/install.yml b/roles/postgresql/tasks/install.yml
index eb77dcac9..535bb1794 100644
--- a/roles/postgresql/tasks/install.yml
+++ b/roles/postgresql/tasks/install.yml
@@ -80,6 +80,21 @@
     state: stopped
     enabled: no
 
+- name: Disable & Stop stock 'postgresql@11-main.service' systemd service - debian-10
+  systemd:
+    name: postgresql@11-main.service
+    state: stopped
+    enabled: no
+#  when: is_debian_10
+  when: is_debian_10 and not is_raspbian
+
+- name: Disable & Stop stock 'postgresql@' systemd service - debian-10
+  systemd:
+    name: postgresql@
+    enabled: no
+#  when: is_debian_10
+  when: is_debian_10 and not is_raspbian
+
 
 # RECORD PostgreSQL AS INSTALLED