diff --git a/debian/control b/debian/control
index deb7750..8af8215 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,18 @@ Source: ngcp-api-tools
 Section: admin
 Priority: extra
 Maintainer: Sipwise Development Team <support@sipwise.com>
-Build-Depends: debhelper (>= 9~),
+Build-Depends: debhelper (>= 9~)
 Standards-Version: 3.9.6
 Homepage: https://www.sipwise.com/
 
 Package: ngcp-api-tools
 Architecture: all
-Depends:
- ngcp-panel,
- perl,
- ${misc:Depends},
+Depends: ngcp-panel,
+         perl,
+         ${misc:Depends}
 Provides: ngcp-api-tools
-Conflicts:
- ngcp-ossbss,
- ngcp-www-admin (<= 2),
+Conflicts: ngcp-ossbss,
+           ngcp-www-admin (<= 2)
 Replaces: ngcp-ossbss
 Description: NGCP REST API related tools
  This package contains files needed by all interface modules on
@@ -23,31 +21,31 @@ Description: NGCP REST API related tools
 
 Package: ngcp-billing-tools
 Architecture: all
-Depends:
- perl,
- ngcp-templates-ce-ngcp-billing-tools | ngcp-templates-pro-ngcp-billing-tools,
- ngcp-panel,
- ${misc:Depends},
+Depends: ngcp-panel,
+         ngcp-templates-ce-ngcp-billing-tools | ngcp-templates-pro-ngcp-billing-tools,
+         perl,
+         ${misc:Depends}
 Provides: ngcp-api-tools
-Conflicts:
- ngcp-ossbss,
- ngcp-www-admin (<= 2),
+Conflicts: ngcp-ossbss,
+           ngcp-ossbss-billing (<< 3.19),
+           ngcp-www-admin (<= 2)
 Replaces: ngcp-ossbss
+Breaks: ngcp-ossbss-billing (<< 3.19)
 Description: NGCP Billing related tools
  This package contains files needed by all interface modules on
  NGCP management hosts.
 
 Package: ngcp-provisioning-tools
 Architecture: all
-Depends:
- perl,
- ngcp-panel,
- ngcp-templates-ce-ngcp-provisioning-tools | ngcp-templates-pro-ngcp-provisioning-tools,
- ${misc:Depends},
+Depends: ngcp-panel,
+         ngcp-templates-ce-ngcp-provisioning-tools | ngcp-templates-pro-ngcp-provisioning-tools,
+         perl,
+         ${misc:Depends}
 Provides: ngcp-api-tools
-Conflicts:
- ngcp-ossbss,
- ngcp-www-admin (<= 2),
+Conflicts: ngcp-ossbss,
+           ngcp-ossbss-clients-perl (<< 3.19),
+           ngcp-www-admin (<= 2)
+Breaks: ngcp-ossbss-clients-perl (<< 3.19)
 Replaces: ngcp-ossbss
 Description: NGCP Provisioning related tools
  This package contains files needed by all interface modules on
diff --git a/debian/ngcp-provisioning-tools.links b/debian/ngcp-provisioning-tools.links
index 23f673c..11d4afa 100644
--- a/debian/ngcp-provisioning-tools.links
+++ b/debian/ngcp-provisioning-tools.links
@@ -1,3 +1,3 @@
-/usr/bin/ngcp-terminate_customer    /usr/bin/ngcp-delete_voip_account
 /usr/bin/ngcp-get_customer          /usr/bin/ngcp-get_voip_account
+/usr/bin/ngcp-terminate_customer    /usr/bin/ngcp-delete_voip_account
 /usr/bin/ngcp-terminate_subscriber  /usr/bin/ngcp-delete_subscriber