diff --git a/0005-dracut-Don-t-include-the-ignition-module-by-default.patch b/0005-dracut-Don-t-include-the-ignition-module-by-default.patch
deleted file mode 100644
index 4182ca5..0000000
--- a/0005-dracut-Don-t-include-the-ignition-module-by-default.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Fabian Vogt <fvogt@suse.de>
-Date: Mon, 21 Aug 2023 14:17:01 +0200
-Subject: [PATCH] dracut: Don't include the ignition module by default
-
-Currently the module is automatically included in all initrds, hostonly or
-generic. Leave it to the distro provided module to pull it in explicitly.
----
-diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh
-index ad7e80fd..f431b7dc 100755
---- a/dracut/30ignition/module-setup.sh
-+++ b/dracut/30ignition/module-setup.sh
-@@ -2,6 +2,13 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
-+check() {
-+    # Only include this if another module requests it.
-+    # In our case it'll be the distro provided module with integration and customizations
-+    # (coreos-ignition/ignition-microos/...).
-+    return 255
-+}
-+
- depends() {
-     echo qemu systemd url-lib network
- }
--- 
-2.41.0
-
diff --git a/_service b/_service
index 62d08d1..69a27a1 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">2.17.0</param>
-    <param name="revision">v2.17.0</param>
+    <param name="version">2.18.0</param>
+    <param name="revision">v2.18.0</param>
     <param name="url">https://github.com/coreos/ignition</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
diff --git a/_servicedata b/_servicedata
index 5f268cf..f50b5e2 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/coreos/ignition</param>
-    <param name="changesrevision">45e9d394a3e4f240e9d6745af0a83fa36179f510</param>
+    <param name="changesrevision">0abc4078a1bb40077c3e094fc3d70a8dbcb7ec02</param>
  </service>
 </servicedata>
\ No newline at end of file
diff --git a/ignition-2.17.0.tar.xz b/ignition-2.17.0.tar.xz
deleted file mode 100644
index 920829d..0000000
--- a/ignition-2.17.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d2dd7041134a71cb423049f15b85b9fa3008aab7910bd02369dc4bd69129edc9
-size 2631880
diff --git a/ignition-2.18.0.tar.xz b/ignition-2.18.0.tar.xz
new file mode 100644
index 0000000..09db65f
--- /dev/null
+++ b/ignition-2.18.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:656123a37afb787df9ee751df1646e130d9f8f567a3cc6bbb41b06bde82496af
+size 2952632
diff --git a/ignition.changes b/ignition.changes
index 51903bf..b195aa8 100644
--- a/ignition.changes
+++ b/ignition.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Mar 08 11:49:12 UTC 2024 - iforster@suse.com
+
+- Update to version 2.18.0:
+  * NEWS: update 2.18.0
+  * azure: retry HTTP requests on codes 404, 410, and 429
+  * docs: add missing scaleway link
+  * providers: add scaleway
+  * resource/url: customize local address (port)
+  * stages/files: filter out non-existent paths before relabeling
+  * docs/release-notes: tweak dracut module change
+  * Bump minimum Go version to 1.20
+  * dracut: Don't include the ignition module by default
+  * ci: cancel previous build on PR update
+  * Sync repo templates ⚙
+  * Update build(deps)
+- Remove because included in upstream now:
+  0005-dracut-Don-t-include-the-ignition-module-by-default.patch
+- Increased required Go version
+
 -------------------------------------------------------------------
 Fri Mar  1 12:53:50 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/ignition.spec b/ignition.spec
index 30d3594..f170e58 100644
--- a/ignition.spec
+++ b/ignition.spec
@@ -17,7 +17,7 @@
 
 
 Name:           ignition
-Version:        2.17.0
+Version:        2.18.0
 Release:        0
 Summary:        First boot installer and configuration tool
 License:        Apache-2.0
@@ -43,13 +43,11 @@ Patch1:         0001-ignore-missing-qemu-blockdev.patch
 Patch2:         0002-allow-multiple-mounts-of-same-device.patch
 Patch3:         0003-Move-the-GPT-header-on-resized-disks.patch
 Patch4:         0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch
-# https://github.com/coreos/ignition/pull/1698
-Patch5:         0005-dracut-Don-t-include-the-ignition-module-by-default.patch
 BuildRequires:  dracut
 BuildRequires:  libblkid-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  update-bootloader-rpm-macros
-BuildRequires:  golang(API) >= 1.19
+BuildRequires:  golang(API) >= 1.20
 # combustion provides firstboot.target and ignition-kargs-helper calls combustion
 Requires:       combustion >= 1.2
 Requires:       dracut