diff --git a/.changelog/3327.internal.5.md b/.changelog/3327.internal.5.md
index bd827cf30b6..eb85c8ee356 100644
--- a/.changelog/3327.internal.5.md
+++ b/.changelog/3327.internal.5.md
@@ -1 +1 @@
-github: Bump GoReleaser in release workflow to 0.143.0
+github: Bump GoReleaser in ci-reproducibility and release workflows to 0.143.0
diff --git a/.changelog/3368.internal.1.md b/.changelog/3368.internal.1.md
new file mode 100644
index 00000000000..eb85c8ee356
--- /dev/null
+++ b/.changelog/3368.internal.1.md
@@ -0,0 +1 @@
+github: Bump GoReleaser in ci-reproducibility and release workflows to 0.143.0
diff --git a/.changelog/3368.internal.2.md b/.changelog/3368.internal.2.md
new file mode 100644
index 00000000000..d86ec5bc9cc
--- /dev/null
+++ b/.changelog/3368.internal.2.md
@@ -0,0 +1,6 @@
+Make: Refactor release-related targets
+
+- Rename `tag-next-release` target to `release-tag`.
+- Rename `release` target to `release-build`.
+- Add `release-stable-branch` target that creates and pushes a stable branch
+  for the current release.
diff --git a/.github/workflows/ci-reproducibility.yml b/.github/workflows/ci-reproducibility.yml
index fc0f9e9e97a..0a34832db38 100644
--- a/.github/workflows/ci-reproducibility.yml
+++ b/.github/workflows/ci-reproducibility.yml
@@ -39,7 +39,7 @@ jobs:
           go-version: "1.15.x"
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
-      - name: Install oasis-node build prerequisites
+      - name: Install Oasis Node prerequisites
         run: |
           sudo apt-get update
           sudo apt-get install make libseccomp-dev protobuf-compiler
@@ -54,19 +54,19 @@ jobs:
           tar -xf ${GORELEASER_TARBALL}
           sudo mv goreleaser /usr/local/bin
         env:
-          GORELEASER_URL_PREFIX: https://github.com/oasislabs/goreleaser/releases/download/
-          GORELEASER_VERSION: 0.123.3-oasis1
+          GORELEASER_URL_PREFIX: https://github.com/goreleaser/goreleaser/releases/download/
+          GORELEASER_VERSION: 0.143.0
           GORELEASER_TARBALL: goreleaser_Linux_x86_64.tar.gz
           CURL_CMD: curl --proto =https --tlsv1.2 -sSL
-      - name: Build oasis-node with Make
+      - name: Build Oasis Node with Make
         run: |
           cd build${{ matrix.build_number }}/go
           make oasis-node
-      - name: Build oasis-node with GoReleaser
+      - name: Build Oasis Node with GoReleaser
         run: |
           cd build${{ matrix.build_number }}
-          make release
-      - name: Get checksums of oasis-node builds
+          make release-build
+      - name: Get checksums of Oasis Node builds
         run: |
           cd build${{ matrix.build_number }}
           sha256sum ${OASIS_NODE_MAKE_PATH} ${OASIS_NODE_GORELEASER_PATH} > ../oasis-node-SHA256SUMs
@@ -109,4 +109,3 @@ jobs:
             echo -e "$DIFF"
             exit 1
           fi
-
diff --git a/Makefile b/Makefile
index 51767e4a14e..fd56f944c3b 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,9 @@ release-stable-branch: fetch-git
 # Build and publish the next release.
 release-build:
 	@$(ENSURE_VALID_RELEASE_BRANCH_NAME)
+ifeq ($(OASIS_CORE_REAL_RELEASE), true)
 	@$(ENSURE_GIT_VERSION_EQUALS_PUNCH_VERSION)
+endif
 	@$(ECHO) "$(CYAN)*** Building release version of oasis-core-runtime-loader...$(OFF)"
 	@CARGO_TARGET_DIR=target/default cargo build -p oasis-core-runtime-loader --release
 	@cp target/default/release/oasis-core-runtime-loader .