diff --git a/.github/scripts/verify-query-packages.sh b/.github/scripts/verify-query-packages.sh
index c91afc4..65cc85f 100755
--- a/.github/scripts/verify-query-packages.sh
+++ b/.github/scripts/verify-query-packages.sh
@@ -72,7 +72,7 @@ test "$(TARGET_KERNEL_FLAVORS=generic ./query-packages.sh list linux-kernel)" ==
 # Check that when a package has multiple dependencies they are printed in the
 # expected format.
 test "$(TARGET_KERNEL_FLAVORS="generic aws" ./query-packages.sh single -o dependencies zfs)" == \
-	"linux-kernel-generic,linux-kernel-aws,delphix-rust,dwarves"
+	"linux-kernel-generic,linux-kernel-aws,delphix-rust,delphix-go,dwarves"
 
 # Check that the output from the appliance list contains zfs and
 # delphix-platform packages. Note, we explicitly do not use grep -q here as it
diff --git a/package-lists/build/main.pkgs b/package-lists/build/main.pkgs
index 723685e..697fa1d 100644
--- a/package-lists/build/main.pkgs
+++ b/package-lists/build/main.pkgs
@@ -9,6 +9,7 @@ challenge-response
 cloud-init
 crash-python
 crypt-blowfish
+delphix-go
 delphix-platform
 delphix-rust
 delphix-sso-app
diff --git a/packages/delphix-go/config.sh b/packages/delphix-go/config.sh
new file mode 100755
index 0000000..f992629
--- /dev/null
+++ b/packages/delphix-go/config.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# Copyright 2021 Delphix
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# shellcheck disable=SC2034
+
+DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/delphix-go.git"
+
+function build() {
+	logmust mkdir -p "$WORKDIR/repo"
+	logmust dpkg_buildpackage_default
+}
diff --git a/packages/zfs/config.sh b/packages/zfs/config.sh
index 4b9ef5b..69ec7d0 100644
--- a/packages/zfs/config.sh
+++ b/packages/zfs/config.sh
@@ -17,7 +17,7 @@
 # shellcheck disable=SC2034
 
 DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/zfs.git"
-PACKAGE_DEPENDENCIES="@linux-kernel delphix-rust dwarves"
+PACKAGE_DEPENDENCIES="@linux-kernel delphix-rust delphix-go dwarves"
 
 UPSTREAM_GIT_URL="https://github.com/openzfs/zfs.git"
 UPSTREAM_GIT_BRANCH="master"
@@ -56,6 +56,7 @@ function prepare() {
 		zlib1g-dev
 	logmust install_kernel_headers
 	logmust install_pkgs "$DEPDIR"/delphix-rust/*.deb
+	logmust install_pkgs "$DEPDIR"/delphix-go/*.deb
 	logmust install_pkgs "$DEPDIR"/dwarves/*.deb
 }
 
diff --git a/setup.sh b/setup.sh
index 9881811..9be7405 100755
--- a/setup.sh
+++ b/setup.sh
@@ -33,7 +33,7 @@ function configure_apt_sources() {
 	if [[ -z "$primary_url" ]] || [[ -z "$secondary_url" ]]; then
 		local latest_url="http://linux-package-mirror.delphix.com/"
 		if is_release_branch; then
-			package_mirror_url="${latest_url}${DEFAULT_GIT_BRANCH}"
+			package_mirror_url="${latest_url}releases/${DELPHIX_RELEASE_VERSION}"
 		else
 			latest_url+="${DEFAULT_GIT_BRANCH}/latest/"
 			package_mirror_url=$(curl -LfSs -o /dev/null -w '%{url_effective}' \