diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index 3d0018cfbd..7241a58658 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -2,7 +2,7 @@ name: Docker Build
 on:
   push:
     branches:
-      - master
+      - legacy
       - 'build/**'
 
 jobs:
diff --git a/.github/workflows/omnibus_build.yml b/.github/workflows/omnibus_build.yml
index ea054de273..7594b96487 100644
--- a/.github/workflows/omnibus_build.yml
+++ b/.github/workflows/omnibus_build.yml
@@ -111,11 +111,11 @@ jobs:
           sudo rm -rf /tmp/firezone*
           rm -rf omnibus/pkg/*
 
-  # Publish packages to the drafted release on merges to master so we can
+  # Publish packages to the drafted release on merges to legacy so we can
   # manually test them if needed. Then we can just publish the drafted release
   # and we're good to go.
   publish:
-    if: startsWith(github.ref, 'refs/heads/master')
+    if: startsWith(github.ref, 'refs/heads/legacy')
     needs:
       - build-package-test
       - draft-release
diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml
index 0d2ef327c2..7593527fdc 100644
--- a/.github/workflows/static_analysis.yml
+++ b/.github/workflows/static_analysis.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - legacy
 
 jobs:
   static-analysis:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4f70e39c2e..d0e0fb0591 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - legacy
 
 jobs:
   unit-test:
@@ -216,12 +216,12 @@ jobs:
         run: mix deps.get --only $MIX_ENV
       - name: Compile
         run: mix compile
-      - name: Download master branch DB dump
+      - name: Download legacy branch DB dump
         id: download-artifact
         uses: dawidd6/action-download-artifact@v2
-        if: "!contains(github.ref, 'master')"
+        if: "!contains(github.ref, 'legacy')"
         with:
-          branch: master
+          branch: legacy
           name: db-dump
           path: apps/fz_http/priv/repo/
           search_artifacts: true
@@ -231,7 +231,7 @@ jobs:
         run: |
           mix ecto.create
       - name: Restore DB dump
-        if: "!contains(github.ref, 'master')"
+        if: "!contains(github.ref, 'legacy')"
         env:
           PGPASSWORD: postgres
         run: |
@@ -240,7 +240,7 @@ jobs:
         run: |
           mix ecto.migrate
       - name: Dump DB
-        if: "contains(github.ref, 'master')"
+        if: "contains(github.ref, 'legacy')"
         env:
           PGPASSWORD: postgres
         run: |
@@ -249,8 +249,8 @@ jobs:
             --file apps/fz_http/priv/repo/structure.sql \
             --no-acl \
             --no-owner
-      - name: Upload master branch DB dump
-        if: "contains(github.ref, 'master')"
+      - name: Upload legacy branch DB dump
+        if: "contains(github.ref, 'legacy')"
         uses: actions/upload-artifact@v3
         with:
           name: db-dump
@@ -303,7 +303,7 @@ jobs:
           - 8400:8080/tcp
           - 8443:8443/tcp
     steps:
-      - uses: nanasess/setup-chromedriver@v1
+      - uses: nanasess/setup-chromedriver@v2
       - run: |
           export DISPLAY=:99
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
diff --git a/apps/fz_wall/lib/fz_wall/cli/live.ex b/apps/fz_wall/lib/fz_wall/cli/live.ex
index 558d31e0a1..a05528a5f8 100644
--- a/apps/fz_wall/lib/fz_wall/cli/live.ex
+++ b/apps/fz_wall/lib/fz_wall/cli/live.ex
@@ -161,7 +161,7 @@ defmodule FzWall.CLI.Live do
       get_filter_set_name(rule.user_id, ip_type, rule.action, layer4),
       rule.destination,
       port_type,
-      rule.port_range
+      FzHttp.Types.Int4Range.cast(rule.port_range)
     )
   end
 end
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index d15d493593..66fb943e11 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -65,7 +65,7 @@ services:
     networks:
       firezone-network:
         ipv4_address: 172.25.0.100
-        ipv6_address: 2001:3990:3990::99
+        ipv6_address: fcff:3990:3990::99
 
     deploy:
       <<: *default-deploy
@@ -96,5 +96,5 @@ networks:
     ipam:
       config:
         - subnet: 172.25.0.0/16
-        - subnet: 2001:3990:3990::/64
-          gateway: 2001:3990:3990::1
+        - subnet: fcff:3990:3990::/64
+          gateway: fcff:3990:3990::1
diff --git a/docker-compose.yml b/docker-compose.yml
index 75c0780c69..ee3f5ee2fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     networks:
       app:
         ipv4_address: 172.28.0.99
-        ipv6_address: 2001:3990:3990::99
+        ipv6_address: fcff:3990:3990::99
 
   firezone:
     build:
@@ -149,5 +149,5 @@ networks:
     ipam:
       config:
         - subnet: 172.28.0.0/16
-        - subnet: 2001:3990:3990::/64
+        - subnet: fcff:3990:3990::/64
   isolation:
diff --git a/scripts/post-down-wg.sh b/scripts/post-down-wg.sh
index a56de0bc18..f54c07a382 100755
--- a/scripts/post-down-wg.sh
+++ b/scripts/post-down-wg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 FIREZONE_DEV_V4='172.28.0.0/16'
-FIREZONE_DEV_V6='2001:3990:3990::/64'
+FIREZONE_DEV_V6='fcff:3990:3990::/64'
 TABLE=333444
 
 sudo ip -4 rule del from $FIREZONE_DEV_V4 table $TABLE
diff --git a/scripts/post-up-wg.sh b/scripts/post-up-wg.sh
index 424c0f7333..5bf2d5e320 100755
--- a/scripts/post-up-wg.sh
+++ b/scripts/post-up-wg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 FIREZONE_DEV_V4='172.28.0.0/16'
-FIREZONE_DEV_V6='2001:3990:3990::/64'
+FIREZONE_DEV_V6='fcff:3990:3990::/64'
 TABLE=333444
 DEFAULT_ROUTE_V4=$(sudo ip -4 route | grep ^default)
 DOCKER_ROUTE_V4=$(sudo ip -4 route | grep ^$FIREZONE_DEV_V4)