diff --git a/Makefile b/Makefile
index f0dff33dcf..deeccf20b8 100644
--- a/Makefile
+++ b/Makefile
@@ -57,11 +57,10 @@ SYSTEMDDIR ?= ${LIBDIR}/systemd/system
 USERSYSTEMDDIR ?= ${LIBDIR}/systemd/user
 SYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/system-generators
 USERSYSTEMDGENERATORSDIR ?= ${LIBDIR}/systemd/user-generators
-REMOTETAGS ?= remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp
+REMOTETAGS ?= remote exclude_graphdriver_btrfs containers_image_openpgp
 BUILDTAGS ?= \
 	$(shell hack/apparmor_tag.sh) \
 	$(shell hack/btrfs_installed_tag.sh) \
-	$(shell hack/btrfs_tag.sh) \
 	$(shell hack/systemd_tag.sh) \
 	$(shell hack/libsubid_tag.sh) \
 	$(if $(filter linux,$(GOOS)), seccomp,)
diff --git a/hack/btrfs_tag.sh b/hack/btrfs_tag.sh
deleted file mode 100755
index ea753d4d02..0000000000
--- a/hack/btrfs_tag.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-${CPP:-${CC:-cc} -E} ${CPPFLAGS} - > /dev/null 2> /dev/null << EOF
-#include <btrfs/version.h>
-EOF
-if test $? -ne 0 ; then
-	echo btrfs_noversion
-fi
diff --git a/pkg/machine/e2e/README.md b/pkg/machine/e2e/README.md
index 090c52628f..72a1c8bd95 100644
--- a/pkg/machine/e2e/README.md
+++ b/pkg/machine/e2e/README.md
@@ -26,7 +26,7 @@ the same result:
 To focus on one specific test on windows, run `ginkgo` manually:
 
 ```pwsh
-$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp"
+$remotetags = "remote exclude_graphdriver_btrfs containers_image_openpgp"
 $focus_file = "basic_test.go"
 $focus_test = "podman build contexts"
 ./test/tools/build/ginkgo.exe `
diff --git a/rpm/podman.spec b/rpm/podman.spec
index 71fd740e61..b1dadbd121 100644
--- a/rpm/podman.spec
+++ b/rpm/podman.spec
@@ -258,19 +258,19 @@ export BASEBUILDTAGS="$BASEBUILDTAGS libtrust_openssl"
 %endif
 
 # build %%{name}
-export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh)"
+export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/libdm_tag.sh)"
 %gobuild -o bin/%{name} ./cmd/%{name}
 
 # build %%{name}-remote
-export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remote"
+export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs remote"
 %gobuild -o bin/%{name}-remote ./cmd/%{name}
 
 # build quadlet
-export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)"
+export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
 %gobuild -o bin/quadlet ./cmd/quadlet
 
 # build %%{name}-testing
-export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)"
+export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh)"
 %gobuild -o bin/podman-testing ./cmd/podman-testing
 
 # reset LDFLAGS for plugins binaries
diff --git a/winmake.ps1 b/winmake.ps1
index 267d89315e..ba7afad989 100644
--- a/winmake.ps1
+++ b/winmake.ps1
@@ -288,7 +288,7 @@ function Get-Podman-Version{
 # Init script
 $target = $args[0]
 
-$remotetags = "remote exclude_graphdriver_btrfs btrfs_noversion containers_image_openpgp"
+$remotetags = "remote exclude_graphdriver_btrfs containers_image_openpgp"
 
 switch ($target) {
     {$_ -in '', 'podman-remote', 'podman'} {