diff --git a/.gitignore b/.gitignore
index 0074695..c9f53a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /weldr-client-35.1.tar.gz
 /weldr-client-35.2.tar.gz
 /weldr-client-35.2.tar.gz.asc
+/weldr-client-35.3.tar.gz
+/weldr-client-35.3.tar.gz.asc
diff --git a/sources b/sources
index 733d5d2..d76c351 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.2.tar.gz) = 15be056982683b9b8d5485ff9aa48dff237a48c3ee9d104c0de16898653facb0a63371a8d31bdf3fb19034022411c8d77e2358b22de52d23768cc7363f4926de
-SHA512 (weldr-client-35.2.tar.gz.asc) = 7aabc7faaedc8c1d87a7b182348aa11a52db8425c7327fe52c560d2a861643e27f6d53628d4261027b092198003f02f12ad3ccb98f8f4ce8ce9e1f39fd67b556
+SHA512 (weldr-client-35.3.tar.gz) = 1f2a79598dbd6d757a3c5ed26434f945659e0ee047a6f241f032325e19688f9722cbbb7e968e0858aa6d276b6d0013ef551b2957fda7b3f68c521a05e9e45ad7
+SHA512 (weldr-client-35.3.tar.gz.asc) = 257c806de93fe83e2bb305af97dd1e3676b83916b67cb5ce7d9ba7131084226bbfa0900ca6647464be6ad88ec2554561b86c4acab01f64b20e6ec61591b08747
 SHA512 (gpg-117E8C168EFE3A7F.key) = 9c760460e3227848c99a1178828512056ac04f518f98bdab5ef36d2aa31c4e5dcda3800d7141cfaf7f2acd0f7f35d4b9971083b6f14f8a36231b74041d4ed88d
diff --git a/weldr-client.spec b/weldr-client.spec
index a6c08de..0e6f25f 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -3,11 +3,11 @@
 # Pass --without signed to skip gpg signed tar.gz (DO NOT DO THAT IN PRODUCTION)
 %bcond_without signed
 
-%global goipath         github.com/osbuild/weldr-client
+%global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.2
-Release:   2%{?dist}
+Version:   35.3
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -51,6 +51,8 @@ Command line utility to control osbuild-composer
 %endif
 
 %build
+export LDFLAGS="-X %{goipath}/cmd/composer-cli/root.Version=%{version} "
+
 %if 0%{?rhel}
 GO_BUILD_PATH=$PWD/_build
 install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
@@ -60,33 +62,33 @@ install -m 0755 -vd _bin
 export PATH=$PWD/_bin${PATH:+:$PATH}
 export GOPATH=$GO_BUILD_PATH:%{gopath}
 export GOFLAGS=-mod=vendor
+%gobuild -o composer-cli %{goipath}/cmd/composer-cli
 %else
 export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"
 export GO111MODULE=off
+make GOBUILDFLAGS="%{gobuildflags}" build
 %endif
 
-export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} "
-make GOBUILDFLAGS="%{gobuildflags}" build
 
 ## TODO
 ##make man
 
 %if %{with tests} || 0%{?rhel}
+export BUILDTAGS="integration"
+
 # Build test binaries with `go test -c`, so that they can take advantage of
-# golang's testing package. The golang rpm macros don't support building them
+# golang's testing package. The RHEL golang rpm macros don't support building them
 # directly. Thus, do it manually, taking care to also include a build id.
 #
 # On Fedora, also turn off go modules and set the path to the one into which
 # the golang-* packages install source code.
-%if 0%{?fedora}
-export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"
-export GO111MODULE=off
-%endif
-
-export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} "
-export BUILDTAGS="integration"
+%if 0%{?rhel}
+export LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
+go test -c -tags=integration -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
+%else
 make GOBUILDFLAGS="%{gobuildflags}" integration
 %endif
+%endif
 
 %install
 make DESTDIR=%{buildroot} install
@@ -101,8 +103,10 @@ export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"
 export GO111MODULE=off
 %endif
 
-export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} "
-make GOBUILDFLAGS="%{gotestflags}" test
+# Run the unit tests
+export LDFLAGS="-X %{goipath}/cmd/composer-cli/root.Version=%{version} "
+make test
+
 
 %files
 %license LICENSE
@@ -127,25 +131,44 @@ composer-cli package.
 
 
 %changelog
-* Mon Aug 23 2021 Brian C. Lane <bcl@redhat.com> - 35.2-2
-- Fix sources to include key and signature
-
-* Mon Aug 23 2021 Brian C. Lane <bcl@redhat.com> - 35.2-1
-- New release: 35.2 (bcl)
-- weldr: Use assert.Contains instead of IsStringInSlice (bcl)
-- Add missing projects depsolve command (bcl)
-- Add support for projects info --distro=DISTRO-NAME (bcl)
-- Add support for projects list --distro=DISTRO-NAME (bcl)
-- Add support for modules info --distro=DISTRO-NAME (bcl)
-- weldr: Add distros to testState (bcl)
-- Add support for modules list --distro=DISTRO-NAME (bcl)
-- weldr: Add AppendQuery helper function (bcl)
-- Add support for compose types --distro=DISTRO-NAME (bcl)
-- composer-cli: Add distros list command (bcl)
-- weldr: Add ListDistros function and tests (bcl)
-- Makefile: Add scratch-srpm and scratch-rpm targets (bcl)
-- Print filename for compose results (bcl)
-- ExcuteTests - return the correct error variables in case of errors (atodorov)
-- The rpm package should obsolete composer-cli from lorax (bcl)
-- tests: Enable CodeCov.io (atodorov)
-- actions: Install lint using GOPATH (bcl)
+* Mon Oct 04 2021 Brian C. Lane <bcl@redhat.com> - 35.3-1
+- New release: 35.3 (bcl)
+- spec: Adjust build methods for RHEL 8 (bcl)
+- github: Run build-in-podman to test building package (bcl)
+- spec: Use v2 module (bcl)
+- Makefile: Use v2 module (bcl)
+- Makefile: Add a build-in-podman target (bcl)
+- tests: Add JSON and error result testing to status (bcl)
+- tests: Add JSON and error result testing to sources (bcl)
+- tests: Add JSON and error result testing to projects (bcl)
+- tests: Add JSON and error result testing to modules (bcl)
+- tests: Add JSON and error result testing to distros (bcl)
+- tests: Add JSON and error result testing to compose (bcl)
+- tests: Add JSON and error result testing to blueprints (bcl)
+- test: Fix test client setup and output capture code (bcl)
+- test: Close output capture in printwrap_test (bcl)
+- test: reset the root flags on every ExecuteTest call (bcl)
+- status: Use ExecutionErrors for API errors (bcl)
+- sources: Use ExecutionErrors for API errors (bcl)
+- projects: Use ExecutionErrors for API errors (bcl)
+- modules: Use ExecutionErrors for API errors (bcl)
+- distros: Use ExecutionErrors for API errors (bcl)
+- compose: Use ExecutionErrors for API errors (bcl)
+- blueprints: Use ExecutionErrors for API errors (bcl)
+- composer-cli: Turn off normal command Stdout when --json is used (bcl)
+- weldr: Fix Stringer interface on API messages (bcl)
+- weldr: Clean up error message return code (bcl)
+- weldr: Move Unmarshal error to error position (bcl)
+- root: Add a helper function to print a list of errors (bcl)
+- Use GetFilePath for ComposeImage (bcl)
+- Use GetFilePath for ComposeResults (bcl)
+- Use GetFilePath for ComposerMetadata (bcl)
+- Use GetFilePath for ComposeLogs (bcl)
+- weldr: Add GetFilePath to download a file to a path (bcl)
+- Creating v2 module for breaking API changes (bcl)
+- Makefile: Add update-mods target (bcl)
+- vendor: Update the modules and vendor directory (bcl)
+- Bump go version to 1.15 (bcl)
+- Limit dependabot to 1 PR (bcl)
+- Enable Dependabot service (atodorov)
+- tests: Fix integration tests (bcl)
\ No newline at end of file