diff --git a/2493.patch b/2493.patch
deleted file mode 100644
index 8438a51..0000000
--- a/2493.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b5a13bccfddd7eecdb4d046d3abc7519cf0ade0c Mon Sep 17 00:00:00 2001
-From: Paul Holzinger <pholzing@redhat.com>
-Date: Fri, 10 Jan 2025 14:31:12 +0100
-Subject: [PATCH] systemtest: update quay.io registry image
-
-The "2" tag is very old and not a multi arch manifest. As such testing
-on aarch64 failed because it pulled and x86_64 image instead. This was
-found in downstream RHEL testing.
-
-The "2.8.2" is multi arch and used in podman testing were we
-successfully run aarch64 based testing.
-
-Signed-off-by: Paul Holzinger <pholzing@redhat.com>
----
- systemtest/helpers.bash | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemtest/helpers.bash b/systemtest/helpers.bash
-index 7056235a0f..b18ecc78fc 100644
---- a/systemtest/helpers.bash
-+++ b/systemtest/helpers.bash
-@@ -10,7 +10,7 @@ SKOPEO_BINARY=${SKOPEO_BINARY:-${TEST_SOURCE_DIR}/../bin/skopeo}
- SKOPEO_TIMEOUT=${SKOPEO_TIMEOUT:-300}
- 
- # Default image to run as a local registry
--REGISTRY_FQIN=${SKOPEO_TEST_REGISTRY_FQIN:-quay.io/libpod/registry:2}
-+REGISTRY_FQIN=${SKOPEO_TEST_REGISTRY_FQIN:-quay.io/libpod/registry:2.8.2}
- 
- ###############################################################################
- # BEGIN setup/teardown
diff --git a/skopeo.spec b/skopeo.spec
index ebc21a8..641ee64 100644
--- a/skopeo.spec
+++ b/skopeo.spec
@@ -7,15 +7,6 @@
 %global debug_package %{nil}
 %endif
 
-# RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
-# set it separately here and do not depend on RHEL's go-[s]rpm-macros package
-# until that's fixed.
-# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328
-# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331
-%if %{defined rhel}
-%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
-%endif
-
 %global gomodulesmode GO111MODULE=on
 
 # No btrfs on RHEL
@@ -43,10 +34,10 @@ Epoch: %{conditional_epoch}
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.17.0
+Version: 1.18.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
-Release: 3%{?dist}
+Release: 1%{?dist}
 %if %{defined golang_arches_future}
 ExclusiveArch: %{golang_arches_future}
 %else
@@ -56,7 +47,6 @@ Summary: Inspect container images and repositories on registries
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
 Source0: %{url}/archive/v%{version}.tar.gz
-Patch0: https://patch-diff.githubusercontent.com/raw/containers/skopeo/pull/2493.patch
 BuildRequires: %{_bindir}/go-md2man
 %if %{defined build_with_btrfs}
 BuildRequires: btrfs-progs-devel
@@ -127,7 +117,7 @@ BASEBUILDTAGS="$(hack/libsubid_tag.sh)"
 %if %{defined build_with_btrfs}
 export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_tag.sh) $(hack/btrfs_installed_tag.sh)"
 %else
-export BUILDTAGS="$BASEBUILDTAGS btrfs_noversion exclude_graphdriver_btrfs"
+export BUILDTAGS="$BASEBUILDTAGS btrfs_noversion exclude_graphdriver_btrfs libtrust_openssl"
 %endif
 
 # unset LDFLAGS earlier set from set_build_flags
@@ -167,6 +157,10 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Feb 13 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.18.0-1
+- update to https://github.com/containers/skopeo/releases/tag/v1.18.0
+- Related: RHEL-58990
+
 * Thu Jan 23 2025 Jindrich Novy <jnovy@redhat.com> - 1:1.17.0-3
 - fix 'Skopeo system tests pulling amd64 image on aarch64'
 - Resolves: RHEL-76027
diff --git a/sources b/sources
index d89d5dc..6ece875 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.17.0.tar.gz) = 72cee72a88764a85252ff1812aff284215805db10708fdfd4f3c778d7efec16b8a0d4d26b966a2e18ca36eea9a98265d75e78967dfb3ea0bf94f98c3b61c6504
+SHA512 (v1.18.0.tar.gz) = 7d56d78b4e0299c187eb2ea46a2d6ac41a4ad30848e9f5fe43285af74c5207f6fc4ee98c15bd5114de7a660e52846f75c26632ae1aa3ccf656b504798a6b1d56