diff --git a/src/build.lock b/src/build.lock
deleted file mode 100644
index 076c922..0000000
--- a/src/build.lock
+++ /dev/null
@@ -1,236 +0,0 @@
-{
-  "locks": [
-    {
-      "type": "layer",
-      "item": "layer:options",
-      "url": "https://github.com/juju-solutions/layer-options.git",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56"
-    },
-    {
-      "type": "layer",
-      "item": "layer:basic",
-      "url": "https://github.com/juju-solutions/layer-basic.git",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "623e69c7b432456fd4364f6e1835424fd6b5425e"
-    },
-    {
-      "type": "layer",
-      "item": "layer:openstack",
-      "url": "https://github.com/openstack/charm-layer-openstack",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "ba152d41b4a1109073d335415f43c4248109e7c7"
-    },
-    {
-      "type": "layer",
-      "item": "layer:openstack-principle",
-      "url": "https://github.com/openstack/charm-layer-openstack-principle",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "8100de4b24ab361423363c75599124708169d871"
-    },
-    {
-      "type": "layer",
-      "item": "layer:openstack-api",
-      "url": "https://github.com/openstack/charm-layer-openstack-api",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "34311a62e963d0ce903b7ddb9d70b8f071f71651"
-    },
-    {
-      "type": "layer",
-      "item": "nova-cell-controller",
-      "url": null,
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "86c799ac2fa1cff00f38d22331917a1105b6adf0"
-    },
-    {
-      "type": "layer",
-      "item": "interface:tls-certificates",
-      "url": "https://github.com/juju-solutions/interface-tls-certificates",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "d9850016d930a6d507b9fd45e2598d327922b140"
-    },
-    {
-      "type": "layer",
-      "item": "interface:mysql-shared",
-      "url": "https://github.com/openstack/charm-interface-mysql-shared",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "06675c43c9f48ffa98b2abf2ddca137f8d18f31c"
-    },
-    {
-      "type": "layer",
-      "item": "interface:rabbitmq",
-      "url": "https://github.com/openstack/charm-interface-rabbitmq",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "383121fc584d2d3bf9d233eba0d3708398a4c468"
-    },
-    {
-      "type": "layer",
-      "item": "interface:keystone",
-      "url": "https://github.com/openstack/charm-interface-keystone",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "a48a1e826ac0a74ab05a16c441cda4e4b34b1241"
-    },
-    {
-      "type": "layer",
-      "item": "interface:hacluster",
-      "url": "https://github.com/openstack/charm-interface-hacluster.git",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "6c611a3c61909fda411f7a79af53908ec7bef2c8"
-    },
-    {
-      "type": "layer",
-      "item": "interface:openstack-ha",
-      "url": "https://github.com/openstack/charm-interface-openstack-ha",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "a3b00e5b5fd857d130698c5cfe4b918877f0ab80"
-    },
-    {
-      "type": "layer",
-      "item": "interface:nova-compute",
-      "url": "https://github.com/openstack/charm-interface-nova-compute.git",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "ea0721a6fa4c3db2fdbee4622e29870e865f58ad"
-    },
-    {
-      "type": "layer",
-      "item": "interface:nova-cell",
-      "url": "https://github.com/openstack/charm-interface-nova-cell.git",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "663e6b741e77dfaf69d992511c53a414234b225a"
-    },
-    {
-      "type": "layer",
-      "item": "interface:keystone-credentials",
-      "url": "https://github.com/openstack/charm-interface-keystone-credentials",
-      "vcs": null,
-      "branch": "refs/heads/master",
-      "commit": "53e93b8820899f2251d207ed5d5c3b212ceb64de"
-    },
-    {
-      "type": "python_module",
-      "package": "charms.openstack",
-      "url": "git+https://opendev.org/openstack/charms.openstack.git",
-      "branch": "refs/heads/stable/21.04",
-      "version": "bcd0c9b4b4a19d4a4125e0a6a3f808a843a74fa1",
-      "vcs": "git"
-    },
-    {
-      "type": "python_module",
-      "package": "netaddr",
-      "vcs": null,
-      "version": "0.7.19"
-    },
-    {
-      "type": "python_module",
-      "package": "pbr",
-      "vcs": null,
-      "version": "5.5.1"
-    },
-    {
-      "type": "python_module",
-      "package": "setuptools",
-      "vcs": null,
-      "version": "41.6.0"
-    },
-    {
-      "type": "python_module",
-      "package": "Jinja2",
-      "vcs": null,
-      "version": "2.10.1"
-    },
-    {
-      "type": "python_module",
-      "package": "pip",
-      "vcs": null,
-      "version": "18.1"
-    },
-    {
-      "type": "python_module",
-      "package": "pyaml",
-      "vcs": null,
-      "version": "20.4.0"
-    },
-    {
-      "type": "python_module",
-      "package": "dnspython",
-      "vcs": null,
-      "version": "1.16.0"
-    },
-    {
-      "type": "python_module",
-      "package": "MarkupSafe",
-      "vcs": null,
-      "version": "1.1.1"
-    },
-    {
-      "type": "python_module",
-      "package": "charmhelpers",
-      "url": "git+https://github.com/juju/charm-helpers.git",
-      "branch": "refs/heads/stable/21.04",
-      "version": "8c48d2914b0e7396a2392c3933e2d7f321643ae6",
-      "vcs": "git"
-    },
-    {
-      "type": "python_module",
-      "package": "wheel",
-      "vcs": null,
-      "version": "0.33.6"
-    },
-    {
-      "type": "python_module",
-      "package": "charms.reactive",
-      "vcs": null,
-      "version": "1.4.1"
-    },
-    {
-      "type": "python_module",
-      "package": "Tempita",
-      "vcs": null,
-      "version": "0.5.2"
-    },
-    {
-      "type": "python_module",
-      "package": "PyYAML",
-      "vcs": null,
-      "version": "5.2"
-    },
-    {
-      "type": "python_module",
-      "package": "setuptools_scm",
-      "vcs": null,
-      "version": "1.17.0"
-    },
-    {
-      "type": "python_module",
-      "package": "psutil",
-      "vcs": null,
-      "version": "5.8.0"
-    },
-    {
-      "type": "python_module",
-      "package": "netifaces",
-      "vcs": null,
-      "version": "0.10.9"
-    },
-    {
-      "type": "python_module",
-      "package": "six",
-      "vcs": null,
-      "version": "1.15.0"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index eb4844b..520681e 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@stable/21.04#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 3dd59f3..1026b85 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,4 +1,4 @@
 
-git+https://opendev.org/openstack/charms.openstack.git@stable/21.04#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
 
-git+https://github.com/juju/charm-helpers.git@stable/21.04#egg=charmhelpers
+git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
diff --git a/test-requirements.txt b/test-requirements.txt
index 16bbc27..3f08524 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@stable/21.04#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
 #
 # Revisit for removal / mock improvement:
 netifaces        # vault