diff --git a/_charms-git-diff b/_charms-git-diff
index 8765a87..aca7db0 100755
--- a/_charms-git-diff
+++ b/_charms-git-diff
@@ -1,14 +1,8 @@
 #!/bin/bash -e
 # Get the git status of the charms -- i.e. what has changed
 
-charms="$(cat charms.txt)"
+charms=$(cd charms && ls -d1 *)
 
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        #exit 1
-    fi
-done
 
 for charm in $charms; do
     echo "===== $charm git status ====="
diff --git a/_charms-git-status b/_charms-git-status
index 5bc9c6a..d9ca4d7 100755
--- a/_charms-git-status
+++ b/_charms-git-status
@@ -1,14 +1,7 @@
 #!/bin/bash -e
 # Get the git status of the charms -- i.e. what has changed
 
-charms="$(cat charms.txt)"
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        #exit 1
-    fi
-done
+charms=$(cd charms && ls -d1 *)
 
 for charm in $charms; do
     echo "===== $charm git status ====="
diff --git a/_do-batch-add-build-lock-file b/_do-batch-add-build-lock-file
deleted file mode 100755
index 1412996..0000000
--- a/_do-batch-add-build-lock-file
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -e
-#  Build only reactive charms with build.lock files; requires the charms to have been synced using
-# ./get-charms
-
-charms="$(cat charms.txt)"
-_dir="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        exit 1
-    fi
-done
-
-for charm in $charms; do
-    charm_type="$(./what-is charms/$charm)"
-    echo "===== $charm ($charm_type) ====="
-    (
-        cd "charms/$charm"
-        case $charm_type in
-            source-zaza)
-                # Build the charm with a lock file and clean-up afterwards
-                ${_dir}/add-build-lock-file
-                ;;
-            classic-zaza)
-                echo "NOOP on $charm as it is a classic charm."
-                ;;
-            *)
-                echo "UNKNOWN TYPE" && exit 1
-                ;;
-        esac
-
-    )
-done
-
diff --git a/_do-batch-cp-stable-candidate b/_do-batch-cp-stable-candidate
deleted file mode 100755
index a571039..0000000
--- a/_do-batch-cp-stable-candidate
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash -e
-#  Build only reactive charms with build.lock files; requires the charms to have been synced using
-# ./get-charms
-
-charms="$(cat charms.txt)"
-_dir="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
-
-
-for charm in $charms; do
-    echo "===== $charm ====="
-    full_charm="cs:~openstack-charmers/$charm"
-    id_revision=$(charm show "$full_charm" --channel stable id | grep -e "Id: $full_charm" | xargs | cut -d " " -f 2)
-    if [ -z "$id_revision" ]; then
-        echo "Nothing to do."
-    else
-        echo "Charm revision is $id_revision"
-
-        # now get the resources:
-        resources_line=$(charm show "$full_charm" resources | yq eval '.resources[] | "--resource " + .Name + "-" + .Revision' - | tr '\n' ' ')
-        echo "resource line is: $resources_line"
-
-        # now try to release it.
-        echo "Running >> charm release $id_revision $resources_line --channel=candidate"
-        charm release $id_revision $resources_line --channel=candidate
-        echo "Running >> charm grant $full_charm --channel candidate --acl read everyone"
-        charm grant $full_charm --channel candidate --acl read everyone
-    fi
-done
-
diff --git a/_do-batch-flip-master-libs-to-stable b/_do-batch-flip-master-libs-to-stable
deleted file mode 100755
index 5a1f315..0000000
--- a/_do-batch-flip-master-libs-to-stable
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash -e
-#  For all the charms, flip the master libs to stable ON THE MASTER branch
-# This is for the freeze period and ensures that during freeze the charms only
-# take updates from the stable libraries.
-# ./get-charms
-
-release="$1"
-
-if [ -z "$release" ]; then
-    echo "Please provide release as only parameter"
-    exit 1
-fi
-
-charms="$(cat charms.txt)"
-_dir="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        exit 1
-    fi
-done
-
-for charm in $charms; do
-    charm_type="$(./what-is charms/$charm)"
-    echo "===== $charm ($charm_type) ====="
-    (
-        cd "charms/$charm"
-        ${_dir}/flip-master-libs-to-stable $release
-    )
-done
-
diff --git a/_do-clean-reactive b/_do-clean-reactive
deleted file mode 100755
index b844e4e..0000000
--- a/_do-clean-reactive
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash -e
-#  Clean-up the build and .tox directories after a build for reactive charms.
-#  This is used after a build step when making reproducible reactive charms.
-
-charms="$(cat charms.txt)"
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        exit 1
-    fi
-done
-
-for charm in $charms; do
-    charm_type="$(./what-is charms/$charm)"
-    echo "===== $charm ($charm_type) ====="
-    (
-        cd "charms/$charm"
-        case $charm_type in
-            source-zaza)
-                rm -rf build
-                rm -rf .tox
-                ;;
-            classic-zaza)
-                echo "NOOP on $charm as it is a classic charm."
-                ;;
-            *)
-                echo "UNKNOWN TYPE" && exit 1
-                ;;
-        esac
-
-    )
-done
-
diff --git a/_do-reset-hard-branch b/_do-reset-hard-branch
index bfbd49c..4685bc7 100755
--- a/_do-reset-hard-branch
+++ b/_do-reset-hard-branch
@@ -1,9 +1,14 @@
 #!/bin/bash -e
 #  Do a reset in all the charms; great for undoing damage and starting again.
 
-charms="$(cat charms.txt)"
+charms=$(cd charms && ls -d1 *)
 branch=$1
 
+if [ -z "$branch" ]; then
+    echo "Please provide the branch name as the param."
+    exit 1
+fi
+
 for charm in $charms; do
     if [ ! -d "charms/$charm" ]; then
         echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
diff --git a/_do-single-charm-amend-review b/_do-single-charm-amend-review
index 2fbcbcc..74a053f 100755
--- a/_do-single-charm-amend-review
+++ b/_do-single-charm-amend-review
@@ -5,6 +5,12 @@
 topic=$1
 script_dir="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
+if [ -z "$topic" ]; then
+    echo "Please provide the topic as the only param."
+    echo "Usage $0 <topic>"
+    exit 1
+fi
+
 _dir=$(pwd)
 # verify that the branch isn't master
 branch=$(git branch --show-current | tr -d '\n')
@@ -20,7 +26,7 @@ if [[ -n "$git_status" ]]; then
     echo "Updating, no-edit-amend and git review with topic for ${_dir}"
     git add .
     git commit --amend --no-edit
-    git review -t charmhub-migration-yoga
+    git review -t $topic
 else
     echo "Nothing to do as git repo is not dirty."
 fi
diff --git a/_do-single-charm-review b/_do-single-charm-review
new file mode 100755
index 0000000..f072047
--- /dev/null
+++ b/_do-single-charm-review
@@ -0,0 +1,24 @@
+#!/bin/bash -e
+#  git add . then amend no-edit and then review.  Topic in param
+# Does a single charm; use with do-batch-with to do the entire batch.
+
+topic=$1
+script_dir="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
+if [ -z "$topic" ]; then
+    echo "Please provide the topic as the only param."
+    echo "Usage $0 <topic>"
+    exit 1
+fi
+
+_dir=$(pwd)
+# verify that the branch isn't master
+branch=$(git branch --show-current | tr -d '\n')
+if [[ "$branch" == "master" ]];
+then
+    echo "Branch is ${_dir}"
+    echo "Branch is master - not updating."
+    exit 0
+fi
+
+git review -t $topic
diff --git a/_ensure_master_libraries_all_charms b/_ensure_master_libraries_all_charms
deleted file mode 100755
index 714c1a9..0000000
--- a/_ensure_master_libraries_all_charms
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#
-# Ensure that charm-helpers, charms.openstack, charms.ceph, zaza and
-# zaza-openstack-tests are from the master branch.
-
-charms="$(cat charms.txt)"
-basedir="$(pwd)"
-
-
-function ensure_line {
-    search="$1"
-    add_line="$2"
-    file="$3"
-    if grep "$search" "$file" >/dev/null; then
-        # line exists so replace it.
-        cmd="/$search/c\\$add_line"
-        sed -i "$cmd" $file
-    else
-        # line doesn't exist so add it
-        echo -e "\n$add_line" >> $file
-    fi
-}
-
-
-function ensure_line_if_exists {
-    search="$1"
-    add_line="$2"
-    file="$3"
-    if grep "$search" "$file" >/dev/null; then
-        # line exists so replace it.
-        cmd="/$search/c\\$add_line"
-        sed -i "$cmd" $file
-    fi
-}
-
-
-# the directory needs to be in the root for the charm repo for this function
-function ensure_lines {
-    charm_type="$($basedir/what-is .)"
-    case $charm_type in
-        classic-zaza)
-            echo "$charm is a classic charm - possibly making changes."
-
-            # charm-helpers-hooks.yaml
-            ensure_line "charm-helpers" "repo: https://github.com/juju/charm-helpers" "charm-helpers-hooks.yaml"
-
-            # test-requirements.txt
-            ensure_line "zaza.git" "git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'" "test-requirements.txt"
-            ensure_line "zaza-openstack-tests" "git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack" "test-requirements.txt"
-            ;;
-
-        source-zaza)
-            echo "$charm is a source charm (reactive) - possibly making changes"
-
-            # src/wheelhouse.txt
-            ensure_line "charms.openstack" "git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack" "src/wheelhouse.txt"
-            ensure_line "charm-helpers" "git+https://github.com/juju/charm-helpers.git#egg=charmhelpers" "src/wheelhouse.txt"
-            ensure_line_if_exists "charms.ceph" "git+https://github.com/openstack/charms.ceph.git#egg=charms.ceph" "src/wheelhouse.txt"
-
-            # test-requirements.txt
-            ensure_line "charms.openstack" "git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack" "test-requirements.txt"
-
-            # src/test-requirements.txt
-            ensure_line "zaza.git" "git+https://github.com/openstack-charmers/zaza.git#egg=zaza" "src/test-requirements.txt"
-            ensure_line "zaza-openstack-tests" "git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack" "src/test-requirements.txt"
-
-            # remote the build lock if present
-            remove_build_lock_if_present
-            ;;
-    esac
-}
-
-
-function remove_build_lock_if_present {
-    [ -e src/build.lock ] && rm src/build.lock
-}
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "charm dir $charm is missing. exiting"
-        exit 1
-    fi
-    (
-        cd charms/$charm
-        ensure_lines
-    )
-done
diff --git a/_ensure_reactive_charms_master_libraries b/_ensure_reactive_charms_master_libraries
deleted file mode 100755
index 9e77f6e..0000000
--- a/_ensure_reactive_charms_master_libraries
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash -e
-#
-# Ensure that charm-helpers and charms.openstack are from the master branch in
-# git.
-
-charms="$(cat charms.txt)"
-basedir="$(pwd)"
-
-
-function ensure_line {
-    search="$1"
-    add_line="$2"
-    if grep "$search" src/wheelhouse.txt >/dev/null; then
-        # line exists so replace it.
-        cmd="/$search/c\\$add_line"
-        sed -i "$cmd" src/wheelhouse.txt
-    else
-        # line doesn't exist so add it
-        echo -e "\n$add_line" >> src/wheelhouse.txt
-    fi
-}
-
-
-# ensure that charm-helpers and charms.openstack master branches are in the
-# wheelhouse.txt
-# the directory needs to be in the root for the charm repo for this function
-function ensure_lines {
-    charm_type="$($basedir/what-is .)"
-    case $charm_type in
-        classic-zaza)
-            echo "$charm is a classic charm - no changes."
-            ;;
-
-        source-zaza)
-            echo "$charm is a source charm (reactive) - possibly making changes"
-            ensure_line "charms.openstack" "git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack"
-            ensure_line "charm-helpers" "git+https://github.com/juju/charm-helpers.git#egg=charmhelpers"
-            ;;
-    esac
-}
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "charm dir $charm is missing. exiting"
-        exit 1
-    fi
-    (
-        cd charms/$charm
-        ensure_lines
-    )
-done
diff --git a/_update-metadata.py b/_update-metadata.py
old mode 100644
new mode 100755
index abebf02..276dc70
--- a/_update-metadata.py
+++ b/_update-metadata.py
@@ -19,7 +19,7 @@
 
 
 def usage():
-    print("usage: {} [list | add | remove | ensure] [<series, ...]"
+    print("usage: {} <charm> [list | add | remove | ensure] [<series, ...]"
           .format(sys.argv[0]))
 
 
@@ -61,27 +61,30 @@ def run_command(cmd, yml):
         sys.exit(1)
 
 
-def charm_dir(cmd):
+def metadata_file(cmd):
+    """Find the metadata.yaml file"""
     charm_dir = os.path.join("charms", cmd.charm)
     if not os.path.isdir(charm_dir):
         print("dir: {} doesn't exist.".format(charm_dir))
         sys.exit(1)
-    src_charm_dir = os.path.join(charm_dir, "src")
-    if os.path.isdir(src_charm_dir):
-        return src_charm_dir
-    else:
-        return charm_dir
+    metadata_in_root = os.path.join(charm_dir, 'metadata.yaml')
+    if (os.path.isfile(metadata_in_root) and
+            not os.path.islink(metadata_in_root)):
+        return metadata_in_root
+    metadata_in_src = os.path.join(charm_dir, 'src', 'metadata.yaml')
+    if os.path.isfile(metadata_in_src):
+        return metadata_in_src
+    print("Can't find metadata!")
+    sys.exit(1)
 
 
 def load_yaml(cmd):
-    file = os.path.join(charm_dir(cmd), "metadata.yaml")
-    with open(file) as f:
+    with open(metadata_file(cmd)) as f:
         return YAML.load(f, YAML.RoundTripLoader)
 
 
 def write_yaml(cmd, yml):
-    file = os.path.join(charm_dir(cmd), "metadata.yaml")
-    with open(file, "w") as f:
+    with open(metadata_file(cmd), "w") as f:
         YAML.dump(yml, f, Dumper=YAML.RoundTripDumper)
 
 
diff --git a/_update-rebuild b/_update-rebuild
index 8fdf298..8829e21 100755
--- a/_update-rebuild
+++ b/_update-rebuild
@@ -3,14 +3,7 @@
 #  have already been performed.  Does not commit, push, or submit/review.
 #  See `batch-example` for usage as a batch of charm updates.
 
-charms="$(cat charms.txt)"
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        exit 1
-    fi
-done
+charms=$(cd charms && ls -d1 *)
 
 for charm in $charms; do
     charm_type="$(./what-is charms/$charm)"
diff --git a/_update-requirements b/_update-requirements
index 3fc1030..b0abc0d 100755
--- a/_update-requirements
+++ b/_update-requirements
@@ -3,14 +3,7 @@
 #  been performed.  Does not commit, push, or submit/review.
 #  See `batch-example` for usage as a batch of charm updates.
 
-charms="$(cat charms.txt)"
-
-for charm in $charms; do
-    if [ ! -d charms/$charm ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        exit 1
-    fi
-done
+charms=$(cd charms && ls -d1 *)
 
 for charm in $charms; do
     charm_type="$(./what-is charms/$charm)"
diff --git a/add-build-lock-file b/add-build-lock-file
index 8ca11d7..b438dfd 100755
--- a/add-build-lock-file
+++ b/add-build-lock-file
@@ -13,9 +13,14 @@ case $charm_type in
     source-zaza)
         # Build the charm.
         if [ ! -f src/build.lock ]; then
-            tox -e add-build-lock-file
+            # copy the add-build-lock file charmcraft in place
+            cp ${_dir}/global/source-zaza/charmcraft-build-lock-file.yaml charmcraft.yaml
+            tox -e build
             rm -rf .tox
-            rm -rf build
+            # unpack the build charm
+            charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
+            unzip -p "${charm}.charm" build.lock >src/build.lock
+            git checkout charmcraft.yaml
             # temporarily workaround the stable branch detection - charm-tools Bug: #606
             sed -i "s#refs/heads/master\\\\nrefs/heads/stable/#refs/heads/stable/#g" src/build.lock
         fi
diff --git a/add-channel-batch b/add-channel-batch
deleted file mode 100755
index fa29110..0000000
--- a/add-channel-batch
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-# Add the channel passed in param $1 to the batch of charms using
-# ./update-channel-single.py helper.
-
-charms="$(cat charms.txt)"
-channel=$1
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        exit 1
-    fi
-done
-
-for charm in $charms; do
-    charm_type="$(./what-is charms/$charm)"
-    echo "===== $charm ($charm_type) ====="
-    (
-        ./update-channel-single.py --channel $channel charms/$charm
-    )
-done
-
diff --git a/add-gerrit-remote b/add-gerrit-remote
new file mode 100755
index 0000000..069774f
--- /dev/null
+++ b/add-gerrit-remote
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+#
+# Add a gerrit remote if one doesn't exist
+# Note that the charms need to have been fetched using fetch-charms.py
+
+basedir="$(pwd)"
+username="$1"
+usage="usage: add-gerrit-remote gerrit-username"
+
+if [ -z "$username" ]; then
+    echo $usage
+    exit 1
+fi
+
+# get the url for the charm.
+TLP=$(grep "^project=.*" .gitreview | perl -n -e'/=(.*)\// && print $1')
+CHARM=$(grep "^project=.*" .gitreview | perl -n -e'/=.*\/(.*.git)/ && print $1')
+
+git remote | grep gerrit || {
+    echo "Adding gerrit remote"
+    git remote add gerrit ssh://${username}@review.openstack.org:29418/${TLP}/${CHARM}
+}
+
diff --git a/check-bug-links b/check-bug-links
index 6fe20ae..7cbdb94 100755
--- a/check-bug-links
+++ b/check-bug-links
@@ -2,7 +2,8 @@
 # Check bug links
 
 DISPOSITION=0
-for charm in $(cat charms.txt); do
+charms=$(cd charms && ls -d1 *)
+for charm in $charms; do
 
   # Handle bug url overrides if present
   if grep "^$charm|" bug-link-overrides.txt > /dev/null; then
diff --git a/check-promulgation b/check-promulgation
deleted file mode 100755
index 63bcd23..0000000
--- a/check-promulgation
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash -ue
-# Check promulgation
-
-DISPOSITION=0
-for charm in $(cat charms.txt); do
-  if charm show cs:$charm -o /dev/null &> /dev/null; then
-      FMT="\e[0mOK  "
-  else
-      FMT="\e[31m**FAIL  "
-      DISPOSITION=1
-  fi
-  echo -e "${FMT}    $charm"
-done
-exit $DISPOSITION
diff --git a/check-repo-links b/check-repo-links
index 6acc703..8f5aa02 100755
--- a/check-repo-links
+++ b/check-repo-links
@@ -2,14 +2,11 @@
 # Check repo links
 
 DISPOSITION=0
-for charm in $(cat charms.txt); do
+charms=$(cd charms && ls -d1 *)
+for charm in $charms; do
 
-  # Handle repo url overrides if present
-  if grep "^$charm|" repo-link-overrides.txt > /dev/null; then
-     REPO_URL=$(grep "^$charm|" repo-link-overrides.txt | cut -f 2 -d "|")
-  else
-     REPO_URL="https://opendev.org/openstack/charm-${charm}"
-  fi
+  TLP=$(grep "^project=.*" charms/$charm/.gitreview | perl -n -e'/=(.*)\// && print $1')
+  REPO_URL="https://opendev.org/${TLP}/charm-${charm}"
 
   HTTP_CODE=$(curl --head -s -o /dev/null -w "%{http_code}" ${REPO_URL})
 
diff --git a/commit-message-update-branches-example.txt b/commit-message-update-branches-example.txt
index 34a888e..0f2cc21 100644
--- a/commit-message-update-branches-example.txt
+++ b/commit-message-update-branches-example.txt
@@ -1,9 +1,9 @@
 Updates for stable branch creation
 
-Set default branch for git review/gerrit.
-
-Switch tests to stable.
-
-Switch to using stable charm-helpers branch.
-
-Switch to using stable charm.openstack branch.
+- Set default branch for git review/gerrit.
+- Switch tests to stable.
+- Switch to using stable charm-helpers branch.
+- Switch to using stable charm.openstack branch.
+- Switch to using stable zaza, zaza-openstack-tests
+  branch
+- (reactive charms) Add build.lock file
diff --git a/commit-review-stable-charms b/commit-review-stable-charms
index 7fe0118..4b24bfc 100755
--- a/commit-review-stable-charms
+++ b/commit-review-stable-charms
@@ -16,7 +16,7 @@ if [ ! -f "$msg_file" ]; then
     exit 1
 fi
 
-charms="$(cat charms.txt)"
+charms=$(cd charms && ls -d1 *)
 basedir="$(pwd)"
 
 for charm in $charms; do
diff --git a/do-batch b/do-batch
index 7a10051..1e9fb05 100755
--- a/do-batch
+++ b/do-batch
@@ -36,7 +36,7 @@ Usage examples:
   Note, no clone
     ./batch-example master some_file.txt topic-name --do-commit --do-review --amend --sync-helpers --update-tox --update-reqs"
 
-charms="$(cat charms.txt)"
+charms=$(cd charms && ls -d1 *)
 branch="$1"
 commit_msg_file="$2"
 gerrit_topic="$3"
diff --git a/flip-master-libs-to-stable b/flip-master-libs-to-stable
deleted file mode 100755
index 830b3d7..0000000
--- a/flip-master-libs-to-stable
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash -e
-#
-# Freeze tasks for 21.04+ (flipping branches to stable)
-# - charm-helpers
-# - charms.openstack
-# - charms.ceph
-# - zaza
-# - zaza-openstack-tests
-#
-# DOES NOT flip the .gitreview nor update the tests bundles
-#
-# the release (21.xx) is in the 1st param.
-# Run in the directory of the charm that is to be flipped.
-# Does NOT stage commits.
-
-release="$1"
-
-if [ -z "$release" ]; then
-    echo "Please provide release as only parameter"
-    exit 1
-fi
-
-for ch in charm-helpers-hooks.yaml charm-helpers-tests.yaml; do
-    if [ -f $ch ]; then
-        sed -i "s/https\:\/\/github.com\/juju\/charm-helpers$/https\:\/\/github.com\/juju\/charm-helpers\@stable\/${release}/g" $ch
-    fi
-    if [ -f src/$ch ]; then
-        sed -i "s/https\:\/\/github.com\/juju\/charm-helpers$/https\:\/\/github.com\/juju\/charm-helpers\@stable\/${release}/g" src/$ch
-    fi
-done
-
-if [ -f src/layer.yaml ]; then
-    set +e
-        grep -q charms.openstack.git@stable src/wheelhouse.txt 2>/dev/null || {
-            echo "Updating charm wheelhouse, with stable 'charms.openstack'"
-            sed -i "s#openstack/charms.openstack.git#openstack/charms.openstack.git@stable/$release#g" src/wheelhouse.txt
-        }
-        grep -q charm-helpers.git@stable src/wheelhouse.txt 2>/dev/null || {
-            echo "Updating charm wheelhouse, with stable 'charmhelpers'"
-            sed -i "s#juju/charm-helpers.git#juju/charm-helpers.git@stable/${release}#g" src/wheelhouse.txt
-        }
-        grep -q charms.openstack.git@stable tests-requirements.txt 2>/dev/null || {
-            echo "Updating test-requirements.txt in repository with stable charms.openstack"
-            sed -i "s#openstack/charms.openstack.git#openstack/charms.openstack.git@stable/$release#g" test-requirements.txt
-        }
-        grep -q zaza-openstack-tests.git@stable src/tests-requirements.txt 2>/dev/null || {
-            echo "Updating src/test-requirements.txt in repository with stable Zaza"
-            sed -i "s#openstack-charmers/zaza.git#openstack-charmers/zaza.git@stable/$release#g" src/test-requirements.txt
-            sed -i "s#openstack-charmers/zaza-openstack-tests.git#openstack-charmers/zaza-openstack-tests.git@stable/$release#g" src/test-requirements.txt
-        }
-    set -e
-else
-    set +e
-        grep -q zaza-openstack-tests.git@stable tests-requirements.txt 2>/dev/null || {
-            echo "Updating test-requirements.txt in repository with stable Zaza"
-            sed -i "s#openstack-charmers/zaza.git#openstack-charmers/zaza.git@stable/$release#g" test-requirements.txt
-            sed -i "s#openstack-charmers/zaza-openstack-tests.git#openstack-charmers/zaza-openstack-tests.git@stable/$release#g" test-requirements.txt
-        }
-    set -e
-fi
diff --git a/get-charms b/get-charms
deleted file mode 100755
index b193d07..0000000
--- a/get-charms
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -e
-# Clones charm branches and checks out the provided branch.
-# Note it clones into the charms/ subdirectory
-
-branch="$1"
-all_charms="$(cat charms.txt)"
-usage="usage: get-charms <master||stable/nn.nn>"
-
-# Optionally useful for local and/or offline iterations:
-# base_url="$HOME/git/release-tools.alt/"
-
-if [ -z "$branch" ]; then
-    echo $usage && exit 1
-fi
-
-[ ! -d "./charms" ] && mkdir charms
-
-for charm in $all_charms; do
-    [ -d "charms/$charm" ] && rm -Rf "charms/$charm"
-
-    # Handle repo url overrides if present
-    if grep "^$charm|" repo-link-overrides.txt > /dev/null; then
-       REPO_URL=$(grep "^$charm|" repo-link-overrides.txt | cut -f 2 -d "|")
-    else
-       REPO_URL="https://opendev.org/openstack/charm-${charm}"
-    fi
-
-    git clone $REPO_URL charms/$charm
-    (cd charms/$charm; git checkout $branch)
-done
-
diff --git a/global/source-zaza/charmcraft-build-lock-file.yaml b/global/source-zaza/charmcraft-build-lock-file.yaml
new file mode 100644
index 0000000..69f4f48
--- /dev/null
+++ b/global/source-zaza/charmcraft-build-lock-file.yaml
@@ -0,0 +1,37 @@
+type: charm
+
+parts:
+  charm:
+    build-packages:
+      - tox
+      - git
+      - python3-dev
+      - libffi-dev
+      - libssl-dev
+      - libxml2-dev
+      - libxslt1-dev
+      - libmysqlclient-dev  # for executable mysql_shell 
+    override-build: |
+      apt-get install ca-certificates -y
+      tox -e add-build-lock-file
+    override-stage: |
+      echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
+      NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
+      cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
+      cp $CHARMCRAFT_PART_BUILD/src/build.lock $CHARMCRAFT_STAGE/build.lock
+    override-prime: |
+      # For some reason, the normal priming chokes on the fact that there's a
+      # hooks directory.
+      cp -r $CHARMCRAFT_STAGE/* .
+
+bases:
+  - build-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures:
+          - amd64
diff --git a/list-revisions-in-charmstore.py b/list-revisions-in-charmstore.py
deleted file mode 100755
index 733fcc5..0000000
--- a/list-revisions-in-charmstore.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from typing import List, Tuple
-import sys
-
-import theblues.charmstore
-import charmstore
-
-name = "nova-compute"
-
-
-def usage():
-    print("usage: {} <charm-name>".format(sys.argv[0]))
-
-
-def parse_args() -> str:
-    if len(sys.argv) < 2:
-        usage()
-        sys.exit(1)
-    charm = sys.argv[1]
-    return charm
-
-
-def get_revisions(name: str) -> List[Tuple[str, str]]:
-    charm = charmstore.CharmStore().search(name)[0]
-    latest = charm.revision
-    print("{} revisions for charm: {}".format(latest, name))
-
-    cs = theblues.charmstore.CharmStore()
-
-    results = []
-    for a in range(1, int(latest)):
-        print(".", end="", flush=True)
-        try:
-            results.append(("{}/{}".format(name, a),
-                            (cs.entity("{}-{}"
-                                       .format(name, a))
-                             ['Meta']['extra-info']['vcs-revisions'][0]['date']
-                             )))
-        except Exception as e:
-            print("Exception was: {}".format(str(e)))
-            pass
-    print()
-    return results
-
-
-def print_revisions(revisions: List[Tuple[str, str]]):
-    for (name, date) in revisions:
-        print(f"{name} - {date}")
-
-
-def run():
-    charm = parse_args()
-    revisions = get_revisions(charm)
-    print_revisions(revisions)
-
-
-if __name__ == "__main__":
-    run()
diff --git a/release-stable-charms b/release-stable-charms
index 0c24e33..8b354a1 100755
--- a/release-stable-charms
+++ b/release-stable-charms
@@ -18,14 +18,8 @@ for charm in $charms; do
     (
         cd charms/$charm
         echo "Looking at charm $charm"
-        # get the url for the charm.
-        TLP=$(grep "^project=.*" .gitreview | perl -n -e'/=(.*)\// && print $1')
-        REPO_URL="https://opendev.org/$TLP/charm-${charm}"
-
-        git remote | grep gerrit || {
-            echo "Adding gerrit remote"
-            git remote add gerrit ssh://${username}@review.openstack.org:29418/${TLP}/charm-${charm}.git
-        }
+        # Add the remote gerrit if needed
+        $basedir/add-gerrit-remote $username
         echo "Creating stable branch for release $release"
         $basedir/create-stable-branch $release
     )
diff --git a/remove-channel-batch b/remove-channel-batch
index b696c03..2c27523 100755
--- a/remove-channel-batch
+++ b/remove-channel-batch
@@ -2,14 +2,7 @@
 # Remove the channel from the bundles of all of the charms using the
 # ./update-channel-single.py helper.
 
-charms="$(cat charms.txt)"
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        exit 1
-    fi
-done
+charms=$(cd charms && ls -d1 *)
 
 for charm in $charms; do
     charm_type="$(./what-is charms/$charm)"
diff --git a/stable-branch-updates b/stable-branch-updates
index 62769fb..ae61911 100755
--- a/stable-branch-updates
+++ b/stable-branch-updates
@@ -5,16 +5,21 @@
 #   - Update .gitreview with new stable branch name.
 
 release="$1"
+branch="$2"
 
-if [ -z "$release" ]; then
-    echo "Please provide release as only parameter"
+if [ -z "$branch" ]; then
+    echo "Please provide release and branch parameters"
+    echo "usage: stable-branch-updates release branch"
+    echo "e.g.   stable-branch-updates yoga jammy"
+    echo " means 'stable/yoga' for libs, and 'stable/jammy' for this charm"
     exit 1
 fi
 
-git checkout -b ${release}-updates origin/stable/${release}
+git fetch --all
+git checkout -b ${release}-updates origin/stable/${branch}
 
 grep -q defaultbranch .gitreview || {
-    echo -e "\ndefaultbranch=stable/$release" >> .gitreview
+    echo -e "\ndefaultbranch=stable/$branch" >> .gitreview
     git add .gitreview
 }
 
diff --git a/update-charms-metadata b/update-charms-metadata
index e32802c..b9c5bd1 100755
--- a/update-charms-metadata
+++ b/update-charms-metadata
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 # Update the charms metadata with a command line "add" "groovy"
 
-charms="$(cat charms.txt)"
+charms=$(cd charms && ls -d1 *)
 cmd=$1
 shift
 params=$@
@@ -11,13 +11,6 @@ if [ ! -d ".tox/py3" ]; then
 fi
 
 
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        exit 1
-    fi
-done
-
 for charm in $charms; do
     echo "===== $charm ====="
     .tox/py3/bin/python _update-metadata.py $charm $cmd $params
diff --git a/update-reactive-stable-charms b/update-reactive-stable-charms
deleted file mode 100755
index a384ea0..0000000
--- a/update-reactive-stable-charms
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash -e
-#
-# Apply stable-branch-updates to just reactive charms (typically post-release charm-helper and zaza stable bit flips).
-
-charms="$(cat charms.txt)"
-basedir="$(pwd)"
-username="$2"
-release="$1"
-usage="usage: update-reactive-stable-charms release-name"
-
-if [ -z "$release" ]; then
-    echo $usage
-    exit 1
-fi
-
-# function to download a charm
-function download_charm(){
-    local charm=$1
-    echo "doing $charm"
-    # Handle repo url overrides if present
-    if grep "^$charm|" repo-link-overrides.txt > /dev/null; then
-       REPO_URL=$(grep "^$charm|" repo-link-overrides.txt | cut -f 2 -d "|")
-    else
-       REPO_URL="https://opendev.org/openstack/charm-${charm}"
-    fi
-
-    git clone $REPO_URL charms/$charm
-}
-
-
-
-for charm in $charms; do
-    if [ -d charms/$charm ]; then
-        # charm exists, so check if it's actually a reactive charm
-        charm_type="$(./what-is charms/$charm)"
-        case $charm_type in
-            source-zaza)
-                echo "===== $charm ($charm_type) =====, but need to redownload"
-                rm -Rf charms/$charm
-                download_charm $charm
-        esac
-    else
-        # charm does not exist, so download it.
-        download_charm $charm
-    fi
-
-    charm_type="$(./what-is charms/$charm)"
-    case $charm_type in
-        classic-zaza)
-            echo "NOOP on $charm."
-            ;;
-
-        source-zaza)
-            # perform the action
-            (
-                cd charms/$charm
-                $basedir/stable-branch-updates $release
-            )
-    esac
-done
diff --git a/update-stable-charms b/update-stable-charms
index 918a1b0..3245361 100755
--- a/update-stable-charms
+++ b/update-stable-charms
@@ -7,9 +7,10 @@ charms=$(cd charms && ls -d1 *)
 basedir="$(pwd)"
 username="$2"
 release="$1"
-usage="usage: update-stable-charms release-name"
+branch="$3"
+usage="usage: update-stable-charms release-name username branch"
 
-if [ -z "$release" ]; then
+if [ -z "$branch" ]; then
     echo $usage
     exit 1
 fi
@@ -19,13 +20,7 @@ for charm in $charms; do
         cd charms/$charm
         echo "Looking at charm $charm"
         # get the url for the charm.
-        TLP=$(grep "^project=.*" .gitreview | perl -n -e'/=(.*)\// && print $1')
-        REPO_URL="https://opendev.org/$TLP/charm-${charm}"
-
-        git remote | grep gerrit || {
-            echo "Adding gerrit remote"
-            git remote add gerrit ssh://${username}@review.openstack.org:29418/${TLP}/charm-${charm}.git
-        }
-        $basedir/stable-branch-updates $release
+        $basedir/add-gerrit-remote $username
+        $basedir/stable-branch-updates $release $branch
     )
 done
diff --git a/zaza-required.yaml b/zaza-required.yaml
deleted file mode 100644
index c0ab721..0000000
--- a/zaza-required.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Impose the following on all managed zaza charms
-gate_bundles:
-  - bionic-rocky-functional
-  - bionic-queens-functional
-  - xenial-pike-functional
-  - xenial-queens-functional
-smoke_bundles:
-  - bionic-queens-functional
-dev_bundles:
-  - cosmic-rocky-functional