diff --git a/src/build.lock b/src/build.lock
new file mode 100644
index 00000000..b1b77a74
--- /dev/null
+++ b/src/build.lock
@@ -0,0 +1,884 @@
+{
+  "locks": [
+    {
+      "item": "layer:leadership",
+      "vcs": null,
+      "url": "https://git.launchpad.net/layer-leadership",
+      "branch": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f",
+      "type": "layer",
+      "commit": "cc5bd3f49b2fa5e6c3ab2336763c313ec8bf083f"
+    },
+    {
+      "item": "layer:options",
+      "vcs": null,
+      "url": "https://github.com/juju-solutions/layer-options.git",
+      "branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56",
+      "type": "layer",
+      "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
+    },
+    {
+      "item": "layer:basic",
+      "vcs": null,
+      "url": "https://github.com/juju-solutions/layer-basic.git",
+      "branch": "623e69c7b432456fd4364f6e1835424fd6b5425e",
+      "type": "layer",
+      "commit": "623e69c7b432456fd4364f6e1835424fd6b5425e"
+    },
+    {
+      "item": "layer:openstack",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-layer-openstack",
+      "branch": "ba152d41b4a1109073d335415f43c4248109e7c7",
+      "type": "layer",
+      "commit": "ba152d41b4a1109073d335415f43c4248109e7c7"
+    },
+    {
+      "item": "layer:openstack-principle",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-layer-openstack-principle",
+      "branch": "8100de4b24ab361423363c75599124708169d871",
+      "type": "layer",
+      "commit": "8100de4b24ab361423363c75599124708169d871"
+    },
+    {
+      "item": "layer:openstack-api",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-layer-openstack-api",
+      "branch": "34311a62e963d0ce903b7ddb9d70b8f071f71651",
+      "type": "layer",
+      "commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
+    },
+    {
+      "item": "octavia",
+      "vcs": null,
+      "url": null,
+      "branch": "28160be9a91a8ac20ec668b047de4ac71fc51d5e",
+      "type": "layer",
+      "commit": "28160be9a91a8ac20ec668b047de4ac71fc51d5e"
+    },
+    {
+      "item": "interface:tls-certificates",
+      "vcs": null,
+      "url": "https://github.com/juju-solutions/interface-tls-certificates",
+      "branch": "d9850016d930a6d507b9fd45e2598d327922b140",
+      "type": "layer",
+      "commit": "d9850016d930a6d507b9fd45e2598d327922b140"
+    },
+    {
+      "item": "interface:mysql-shared",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-interface-mysql-shared",
+      "branch": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c",
+      "type": "layer",
+      "commit": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c"
+    },
+    {
+      "item": "interface:rabbitmq",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-interface-rabbitmq",
+      "branch": "383121fc584d2d3bf9d233eba0d3708398a4c468",
+      "type": "layer",
+      "commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
+    },
+    {
+      "item": "interface:keystone",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-interface-keystone",
+      "branch": "a48a1e826ac0a74ab05a16c441cda4e4b34b1241",
+      "type": "layer",
+      "commit": "a48a1e826ac0a74ab05a16c441cda4e4b34b1241"
+    },
+    {
+      "item": "interface:hacluster",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-interface-hacluster.git",
+      "branch": "6c611a3c61909fda411f7a79af53908ec7bef2c8",
+      "type": "layer",
+      "commit": "6c611a3c61909fda411f7a79af53908ec7bef2c8"
+    },
+    {
+      "item": "interface:openstack-ha",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-interface-openstack-ha",
+      "branch": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80",
+      "type": "layer",
+      "commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
+    },
+    {
+      "item": "interface:neutron-load-balancer",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-interface-neutron-load-balancer.git",
+      "branch": "94897d4743e56ec647fb81cccf2807b091123e21",
+      "type": "layer",
+      "commit": "94897d4743e56ec647fb81cccf2807b091123e21"
+    },
+    {
+      "item": "interface:neutron-plugin",
+      "vcs": null,
+      "url": "https://github.com/openstack/charm-interface-neutron-plugin",
+      "branch": "6b39be106b51b676a370752104df5d895171e699",
+      "type": "layer",
+      "commit": "6b39be106b51b676a370752104df5d895171e699"
+    },
+    {
+      "item": "interface:ovsdb-subordinate",
+      "vcs": null,
+      "url": "https://opendev.org/x/charm-interface-ovsdb.git",
+      "branch": "93e40a6bd571030a4a561ad8928e57515a27f496",
+      "type": "layer",
+      "commit": "93e40a6bd571030a4a561ad8928e57515a27f496"
+    },
+    {
+      "item": "interface:ovsdb-cms",
+      "vcs": null,
+      "url": "https://opendev.org/x/charm-interface-ovsdb.git",
+      "branch": "93e40a6bd571030a4a561ad8928e57515a27f496",
+      "type": "layer",
+      "commit": "93e40a6bd571030a4a561ad8928e57515a27f496"
+    },
+    {
+      "item": "interface:nrpe-external-master",
+      "vcs": null,
+      "url": "https://github.com/cmars/nrpe-external-master-interface",
+      "branch": "2e0e1fdea6d83b55078200aacb537d60013ec5bc",
+      "type": "layer",
+      "commit": "2e0e1fdea6d83b55078200aacb537d60013ec5bc"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "jmespath",
+      "version": "0.10.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "sortedcontainers",
+      "version": "2.3.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "charms.reactive",
+      "version": "1.4.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "futurist",
+      "version": "1.10.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pytz",
+      "version": "2021.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "cffi",
+      "version": "1.14.5"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "setproctitle",
+      "version": "1.1.10"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "cmd2",
+      "version": "0.8.9"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "Mako",
+      "version": "1.1.4"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "setuptools_scm",
+      "version": "3.4.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "linecache2",
+      "version": "1.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "traceback2",
+      "version": "1.4.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "simplejson",
+      "version": "3.17.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "netifaces",
+      "version": "0.10.9"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pyperclip",
+      "version": "1.8.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "osc-lib",
+      "version": "2.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "PasteDeploy",
+      "version": "2.1.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "eventlet",
+      "version": "0.30.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "neutron-lib",
+      "version": "1.31.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "kombu",
+      "version": "4.6.11"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "amqp",
+      "version": "2.6.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "os-client-config",
+      "version": "2.1.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "python-mimeparse",
+      "version": "1.6.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "Routes",
+      "version": "2.5.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "PyYAML",
+      "version": "5.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "openstacksdk",
+      "version": "0.47.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "psutil",
+      "version": "5.8.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pyinotify",
+      "version": "0.9.6"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "cachetools",
+      "version": "4.2.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "stevedore",
+      "version": "1.32.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pyaml",
+      "version": "20.4.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.service",
+      "version": "1.41.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "netaddr",
+      "version": "0.7.19"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.middleware",
+      "version": "3.38.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "python-novaclient",
+      "version": "16.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.i18n",
+      "version": "3.25.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "urllib3",
+      "version": "1.26.4"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pytest-runner",
+      "version": "5.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.utils",
+      "version": "3.42.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.serialization",
+      "version": "2.29.3"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "setuptools",
+      "version": "41.6.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "os-traits",
+      "version": "2.2.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "wheel",
+      "version": "0.33.6"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "repoze.lru",
+      "version": "0.7"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "sqlalchemy-migrate",
+      "version": "0.13.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "alembic",
+      "version": "1.4.3"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "asn1crypto",
+      "version": "1.4.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pecan",
+      "version": "1.4.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "Babel",
+      "version": "2.9.0"
+    },
+    {
+      "vcs": "git",
+      "url": "git+https://opendev.org/openstack/charms.openstack.git",
+      "package": "charms.openstack",
+      "branch": "stable/21.04",
+      "version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1",
+      "type": "python_module"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "importlib_metadata",
+      "version": "2.1.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "greenlet",
+      "version": "1.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "six",
+      "version": "1.15.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "iso8601",
+      "version": "0.1.14"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "SQLAlchemy",
+      "version": "1.3.24"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.db",
+      "version": "6.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "testtools",
+      "version": "2.4.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "argparse",
+      "version": "1.4.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "sqlparse",
+      "version": "0.4.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "requestsexceptions",
+      "version": "1.4.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "jsonpatch",
+      "version": "1.32"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "idna",
+      "version": "2.10"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "python-keystoneclient",
+      "version": "3.22.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.concurrency",
+      "version": "3.31.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "MarkupSafe",
+      "version": "1.1.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "os-ken",
+      "version": "0.4.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "os-service-types",
+      "version": "1.7.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "certifi",
+      "version": "2020.12.5"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "Tempita",
+      "version": "0.5.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "yappi",
+      "version": "1.3.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pbr",
+      "version": "5.5.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "unittest2",
+      "version": "1.1.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "wcwidth",
+      "version": "0.2.5"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.config",
+      "version": "7.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.versionedobjects",
+      "version": "1.37.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "python-neutronclient",
+      "version": "7.1.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "wrapt",
+      "version": "1.12.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "soupsieve",
+      "version": "2.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "rfc3986",
+      "version": "1.4.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "logutils",
+      "version": "0.3.5"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "decorator",
+      "version": "5.0.6"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "dnspython",
+      "version": "1.16.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "cryptography",
+      "version": "2.3.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "zipp",
+      "version": "1.2.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "requests",
+      "version": "2.25.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "munch",
+      "version": "2.5.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "Paste",
+      "version": "3.5.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "osprofiler",
+      "version": "2.9.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.context",
+      "version": "2.23.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pycparser",
+      "version": "2.20"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "ovs",
+      "version": "2.13.3"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "appdirs",
+      "version": "1.4.4"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "prettytable",
+      "version": "0.7.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pyparsing",
+      "version": "2.4.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "cliff",
+      "version": "3.1.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "fasteners",
+      "version": "0.16"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.policy",
+      "version": "2.4.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "pip",
+      "version": "18.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "vine",
+      "version": "1.3.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.log",
+      "version": "3.45.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "beautifulsoup4",
+      "version": "4.9.3"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "Jinja2",
+      "version": "2.10.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "WebTest",
+      "version": "2.0.35"
+    },
+    {
+      "vcs": "git",
+      "url": "git+https://github.com/juju/charm-helpers.git",
+      "package": "charmhelpers",
+      "branch": "stable/21.04",
+      "version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6",
+      "type": "python_module"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "tinyrpc",
+      "version": "1.0.4"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "extras",
+      "version": "1.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "msgpack",
+      "version": "1.0.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "fixtures",
+      "version": "3.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "jsonpointer",
+      "version": "2.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "testresources",
+      "version": "2.0.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "debtcollector",
+      "version": "1.22.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "testscenarios",
+      "version": "0.5.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "toml",
+      "version": "0.10.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "WebOb",
+      "version": "1.8.7"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "oslo.messaging",
+      "version": "10.5.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "chardet",
+      "version": "4.0.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "python-editor",
+      "version": "1.0.4"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "keystoneauth1",
+      "version": "4.1.0"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "dogpile.cache",
+      "version": "0.9.2"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "waitress",
+      "version": "1.4.4"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "python-dateutil",
+      "version": "2.8.1"
+    },
+    {
+      "vcs": null,
+      "type": "python_module",
+      "package": "statsd",
+      "version": "3.3.0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index 520681e1..eb4844b8 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -11,5 +11,5 @@ charm-tools>=2.4.4
 keyring<21
 
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/21.04#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 589846be..a6f82a52 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -21,6 +21,6 @@ zipp < 2.0.0
 # LP: #1915171
 cryptography<3.4
 
-git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
+git+https://opendev.org/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack
 
-git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
+git+https://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers
diff --git a/test-requirements.txt b/test-requirements.txt
index 3f085244..16bbc27d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
 
 nose>=1.3.7
 coverage>=3.6
-git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack
 #
 # Revisit for removal / mock improvement:
 netifaces        # vault
diff --git a/tox.ini b/tox.ini
index ce79fa16..391b2af8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,12 @@ deps =
 [testenv:build]
 basepython = python3
 commands =
-    charm-build --log-level DEBUG -o {toxinidir}/build/builds src {posargs}
+    charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs}
+
+[testenv:add-build-lock-file]
+basepython = python3
+commands =
+    charm-build --log-level DEBUG --write-lock-file -o {toxinidir}/build/builds src {posargs}
 
 [testenv:py3]
 basepython = python3