diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index b2bddec..6a71df0 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -68,7 +68,7 @@ jobs:
       - unit-test
       - build
     name: Functional tests
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-latest, xlarge]
     steps:
 
       - name: Download charm
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 39554a0..3683b39 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -12,13 +12,13 @@ parts:
       apt-get install ca-certificates -y
       tox -e build-reactive
     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/
+      echo "Copying charm to staging area: $CRAFT_STAGE"
+      NAME=$(ls $CRAFT_PART_BUILD/build/builds)
+      cp -r $CRAFT_PART_BUILD/build/builds/$NAME/* $CRAFT_STAGE/
     override-prime: |
       # For some reason, the normal priming chokes on the fact that there's a
       # hooks directory.
-      cp -r $CHARMCRAFT_STAGE/* .
+      cp -r $CRAFT_STAGE/* .
 
 bases:
   - build-on:
diff --git a/tox.ini b/tox.ini
index 9a97eb5..29da39a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -52,7 +52,7 @@ basepython = python3
 deps = -r{toxinidir}/build-requirements.txt
 commands =
     charmcraft clean
-    charmcraft -v build
+    charmcraft -v pack
     {toxinidir}/rename.sh
 
 [testenv:build-reactive]