diff --git a/dev-util/stepman/Manifest b/dev-util/stepman/Manifest
deleted file mode 100644
index 0fe3b47392c48..0000000000000
--- a/dev-util/stepman/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stepman-0.10.5.tar.gz 3197451 BLAKE2B f6a4fd2cc0396c5635d7d45a6d88166669dab0bdfed2d53cb8c809c122ee84039660704326c996436d62797db58d46f35bb73af2415e875cf748be9137304280 SHA512 6bd325e1d50d75bf2a38b89c1faf5275914a3a7f00de0d072450253121d9931c4e32ca85300319aaec90ca108223600d3ff1195276df87b11148d4771c642471
diff --git a/dev-util/stepman/metadata.xml b/dev-util/stepman/metadata.xml
deleted file mode 100644
index 3a9f651114d83..0000000000000
--- a/dev-util/stepman/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Step collection manager for Bitrise CLI. Part of the Bitrise Continuous
-		Integration, Delivery and Automations Stack, with <pkg>dev-util/envman</pkg>
-		and <pkg>dev-util/bitrise</pkg>.  For a nice &amp; quick intro you should check:
-		https://app.bitrise.io/cli
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/bitrise-io/stepman/issues</bugs-to>
-		<doc>https://github.com/bitrise-io/stepman/blob/master/README.md</doc>
-		<remote-id type="github">bitrise-io/stepman</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/stepman/stepman-0.10.5.ebuild b/dev-util/stepman/stepman-0.10.5.ebuild
deleted file mode 100644
index 6d86a2724c21a..0000000000000
--- a/dev-util/stepman/stepman-0.10.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build
-
-EGO_ON="github.com/bitrise-io"
-EGO_PN="${EGO_ON}/${PN}"
-
-DESCRIPTION="Step collection manager for Bitrise CLI"
-HOMEPAGE="https://app.bitrise.io/cli"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/src/${EGO_ON}/${PN}"
-
-src_unpack() {
-	default
-	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
-	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
-}
-
-src_test() {
-	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
-	rm update_test.go step_info_test.go setup_test.go || die "Couldn't remove network-dependent tests"
-	popd || die "Couldn't return to ${S} directory"
-	local -x INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
-	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
-}
-
-src_install() {
-	dobin bin/stepman
-	dodoc README.md
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index e49304c503722..e8b277f984eb0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -534,14 +534,6 @@ dev-ruby/uconv
 # Removal on 2024-06-22.  Bugs #932571, #902899, #887625, #853025, #672702.
 x11-plugins/pidgin-rhythmbox
 
-# Arthur Zamarin <arthurzam@gentoo.org> (2024-05-23)
-# Bitrise stack is abandoned in Gentoo, maintainer-needed, awaits
-# version bump, uses deprecated Go eclasses, EAPI=6, fails to compile
-# with modern C.
-# Removal on 2024-06-22.  Bugs #932570, #844688, #717536, #771066, #844700, #844703.
-dev-util/envman
-dev-util/stepman
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-05-20)
 # Short-lived side-by-side release, now unnecessary as it moved back to
 # kde-apps/kio-extras:5. Removal on 2024-06-04.