diff --git a/LICENSE b/LICENSE
index f63e906..505388c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2017 Mirantis Inc.
+Copyright (c) 2017-2019 Mirantis Inc. et al
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/README.rst b/README.rst
index e1d5990..94a76c1 100644
--- a/README.rst
+++ b/README.rst
@@ -202,35 +202,3 @@
 Release notes:
 
     https://docs.openstack.org/releasenotes/octavia
-
-
-Documentation and Bugs
-======================
-
-To learn how to install and update salt-formulas, consult the documentation
-available online at:
-
-    http://salt-formulas.readthedocs.io/
-
-In the unfortunate event that bugs are discovered, they should be reported to
-the appropriate issue tracker. Use GitHub issue tracker for specific salt
-formula:
-
-    https://github.com/salt-formulas/salt-formula-octavia/issues
-
-For feature requests, bug reports or blueprints affecting entire ecosystem,
-use Launchpad salt-formulas project:
-
-    https://launchpad.net/salt-formulas
-
-Developers wishing to work on the salt-formulas projects should always base
-their work on master branch and submit pull request against specific formula.
-
-You should also subscribe to mailing list (salt-formulas@freelists.org):
-
-    https://www.freelists.org/list/salt-formulas
-
-Any questions or feedback is always welcome so feel free to join our IRC
-channel:
-
-    #salt-formulas @ irc.freenode.net
diff --git a/debian/control b/debian/control
index 67dc8fe..4bba351 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
 Source: salt-formula-octavia
-Maintainer: nfv-dev <nfv-dev@mirantis.com>
+Maintainer: Mirantis Dev <dev@mirantis.com>
 Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 9), salt-master, python, python-yaml
 Standards-Version: 3.9.6
-Homepage: https://mirantis.com
-Vcs-Browser: https://github.com/salt-formulas/salt-formula-octavia
-Vcs-Git: https://github.com/salt-formulas/salt-formula-octavia.git
+Homepage: https://www.mirantis.com
+Vcs-Browser: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/octavia
+Vcs-Git: https://gerrit.mcp.mirantis.com/salt-formulas/octavia.git
 
 Package: salt-formula-octavia
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 878a82c..1fa9d11 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: salt-formula-octavia
-Upstream-Contact: salt-formulas@freelists.org
-Source: https://github.com/salt-formulas/salt-formula-octavia
+Upstream-Contact: Mirantis Dev <dev@mirantis.com>
+Source: https://gerrit.mcp.mirantis.com/salt-formulas/octavia
 
 Files: *
-Copyright: 2017 Mirantis Inc.
+Copyright: 2017-2019 Mirantis Inc. et al
 License: Apache-2.0
-  Copyright (C) 2017 Mirantis Inc.
+  Copyright (C) 2017-2019 Mirantis Inc. et al
   .
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/metadata.yml b/metadata.yml
index 3605324..cac50db 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,8 +1,8 @@
 name: "octavia"
 version: "2017.6"
-source: "https://github.com/salt-formulas/salt-formula-octavia"
+source: "https://gerrit.mcp.mirantis.com/salt-formulas/octavia"
 dependencies:
   - name: neutron
-    source: "https://github.com/salt-formulas/salt-formula-neutron"
+    source: "https://gerrit.mcp.mirantis.com/salt-formulas/neutron"
   - name: nova
-    source: "https://github.com/salt-formulas/salt-formula-nova"
+    source: "https://gerrit.mcp.mirantis.com/salt-formulas/nova"
diff --git a/octavia/files/ocata/octavia_manager.conf b/octavia/files/ocata/octavia_manager.conf
index 1d563e6..a226cd6 100644
--- a/octavia/files/ocata/octavia_manager.conf
+++ b/octavia/files/ocata/octavia_manager.conf
@@ -532,6 +532,7 @@
 
 # Client CA for the amphora agent to use (string value)
 #client_ca = /etc/octavia/certs/ca_01.pem
+client_ca = {{ manager.haproxy_amphora.server_ca }}
 
 # Name of the amphora driver to use (string value)
 #amphora_driver = amphora_noop_driver
diff --git a/octavia/files/pike/octavia_manager.conf b/octavia/files/pike/octavia_manager.conf
index 6cda13e..2b39c6c 100644
--- a/octavia/files/pike/octavia_manager.conf
+++ b/octavia/files/pike/octavia_manager.conf
@@ -552,6 +552,7 @@
 
 # Client CA for the amphora agent to use (string value)
 #client_ca = /etc/octavia/certs/ca_01.pem
+client_ca = {{ manager.haproxy_amphora.server_ca }}
 
 # Name of the amphora driver to use (string value)
 #amphora_driver = amphora_noop_driver
diff --git a/octavia/files/queens/octavia_manager.conf b/octavia/files/queens/octavia_manager.conf
index d5b6b5a..9eebe5f 100644
--- a/octavia/files/queens/octavia_manager.conf
+++ b/octavia/files/queens/octavia_manager.conf
@@ -552,6 +552,7 @@
 
 # Client CA for the amphora agent to use (string value)
 #client_ca = /etc/octavia/certs/ca_01.pem
+client_ca = {{ manager.haproxy_amphora.server_ca }}
 
 # Name of the amphora driver to use (string value)
 #amphora_driver = amphora_noop_driver
diff --git a/octavia/upgrade/upgrade/init.sls b/octavia/upgrade/upgrade/init.sls
index 4666375..a236560 100644
--- a/octavia/upgrade/upgrade/init.sls
+++ b/octavia/upgrade/upgrade/init.sls
@@ -1,8 +1,6 @@
 include:
- - octavia.upgrade.upgrade.pre
  - octavia.upgrade.service_stopped
  - octavia.upgrade.pkgs_latest
  - octavia.upgrade.render_config
  - octavia.db.offline_sync
  - octavia.upgrade.service_running
- - octavia.upgrade.upgrade.post