diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..1a5a603
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.opendev.org
+port=29418
+project=openstack/charm-manila-netapp.git
diff --git a/.jujuignore b/.jujuignore
new file mode 100644
index 0000000..ec8dde9
--- /dev/null
+++ b/.jujuignore
@@ -0,0 +1,8 @@
+.stestr.conf
+.gitmodules
+.gitreview
+.gitignore
+ceph-iscsi.charm
+.zuul.yaml
+.stestr
+unit_tests
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..fd20909
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+    templates:
+      - openstack-python3-charm-jobs
+      - openstack-cover-jobs
diff --git a/copyright b/copyright
new file mode 100644
index 0000000..c441a99
--- /dev/null
+++ b/copyright
@@ -0,0 +1,16 @@
+Format: http://dep.debian.net/deps/dep5/
+
+Files: *
+Copyright: Copyright 2015-2021, Canonical Ltd., All Rights Reserved.
+License: Apache License 2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 9bccb49..9ff985d 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -6,6 +6,8 @@ gate_bundles:
 - focal-victoria
 - groovy-victoria
 
+# WARNING(lourot): func-smoke has been temporarily disabled in tox.ini. See
+# rationale there.
 smoke_bundles:
 - bionic-ussuri
 
diff --git a/tox.ini b/tox.ini
index d87b1d3..09e4245 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,18 @@ skipsdist = True
 sitepackages = False
 # NOTE: Avoid false positives by not skipping missing interpreters.
 skip_missing_interpreters = False
+# NOTES:
+# * We avoid the new dependency resolver by pinning pip < 20.3, see
+#   https://github.com/pypa/pip/issues/9187
+# * Pinning dependencies requires tox >= 3.2.0, see
+#   https://tox.readthedocs.io/en/latest/config.html#conf-requires
+# * It is also necessary to pin virtualenv as a newer virtualenv would still
+#   lead to fetching the latest pip in the func* tox targets, see
+#   https://stackoverflow.com/a/38133283
+requires = pip < 20.3
+           virtualenv < 20.0
+# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
+minversion = 3.2.0
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -17,15 +29,15 @@ install_command =
 commands = stestr run --slowest {posargs}
 whitelist_externals =
     git
-    ln
-    charm-init.sh
+    bash
 passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:py35]
 basepython = python3.5
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+# python3.5 is irrelevant on a bionic+ charm.
+deps =
+commands = /bin/true
 
 [testenv:py36]
 basepython = python3.6
@@ -37,6 +49,11 @@ basepython = python3.7
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
+[testenv:py38]
+basepython = python3.8
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:py3]
 basepython = python3
 deps = -r{toxinidir}/requirements.txt
@@ -86,12 +103,6 @@ deps = -r{toxinidir}/build-requirements.txt
 commands =
     charmcraft build --verbose
 
-[testenv:update-deps]
-basepython = python3
-deps =
-commands =
-    ./charm-init.sh -u
- 
 [testenv:func-noop]
 basepython = python3
 commands =
@@ -104,8 +115,12 @@ commands =
 
 [testenv:func-smoke]
 basepython = python3
-commands =
-    functest-run-suite --keep-model --smoke
+# NOTE(lourot): temporarily disabling Zaza in order to get a green gate as we
+# don't have the necessary NetApp ONTAP cluster deployed yet in order to run
+# these tests.
+commands = /bin/true
+#commands =
+#    functest-run-suite --keep-model --smoke
 
 [testenv:func-dev]
 basepython = python3
@@ -118,4 +133,5 @@ commands =
     functest-run-suite --keep-model --bundle {posargs}
 
 [flake8]
-ignore = E402,E226
+# Ignore E902 because the unit_tests directory is missing in the built charm.
+ignore = E402,E226,E902